Gabriel Calero 13e2b99dfa Merge remote-tracking branch 'upstream/master' into android_signup		2018-10-02 09:24:09 -03:00
..
assets	Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login	2018-05-07 15:56:43 -03:00
cpp	Merge remote-tracking branch 'upstream/master' into android_signup	2018-10-02 09:24:09 -03:00
java	Merge remote-tracking branch 'upstream/master' into android_signup	2018-10-02 09:24:09 -03:00
res	Merge pull request #14013 from gcalero/fix_android_login	2018-10-01 16:13:29 -07:00
AndroidManifest.xml	Add android settings screen. Add AEC setting	2018-09-06 17:49:52 -03:00