Sam Whited 8bf40308c8 Move AboutDialog to correct path		2014-11-04 12:47:58 -05:00
..
java/eu/siacs/conversations	Move AboutDialog to correct path	2014-11-04 12:47:58 -05:00
res	Add about dialog with license info	2014-11-04 12:47:58 -05:00
AndroidManifest.xml	fixed merge error	2014-11-03 21:22:26 +01:00