Nathan Freitas cb2c5fe661 Merge branch 'fix_bug_63' of https://github.com/arrase/orbot into arrase-fix_bug_63 ... Conflicts: app/src/main/java/org/torproject/android/OrbotMainActivity.java		2017-01-14 06:45:43 -05:00
..
java	Merge branch 'fix_bug_63' of https://github.com/arrase/orbot into arrase-fix_bug_63	2017-01-14 06:45:43 -05:00
res	Deal with Doze in the less painful way	2016-12-08 15:22:53 +01:00
AndroidManifest.xml	Deal with Doze in the less painful way	2016-12-08 15:22:53 +01:00