Juan Ezquerro LLanes 3ba1d395ea Merge branch 'master' into hidden_services ... # Conflicts: # app/src/main/java/org/torproject/android/OrbotMainActivity.java		2016-11-29 11:09:49 +01:00
..
androidTest/java/org/torproject/android/service	big check-in of major gradle refactor; now building and running!	2016-06-29 00:20:20 -04:00
main	Merge branch 'master' into hidden_services	2016-11-29 11:09:49 +01:00
test/java/org/torproject/android	big check-in of major gradle refactor; now building and running!	2016-06-29 00:20:20 -04:00