1560 commits

Author	SHA1	Message	Date
Eric House	f5ebee89da	fix duplicate permissions ... Merging of AndroidManifest.xml files meant the dbg flavor was getting its C2D_MESSAGE permission and the main flavor's, which on recent OS versions meant it couldn't be installed. Use substitution from gradle to fix.	2017-01-19 06:22:12 -08:00
Eric House	ea3a8b4034	include relay hostname in debug conn status	2017-01-18 19:30:03 -08:00
Eric House	22ca219347	Merge branch 'android_json' into android_branch ... Accidentally did a bunch of gradle work on the wrong branch, but it's a trivial merge as I hadn't done anything else with it yet.	2017-01-18 19:25:58 -08:00
Eric House	9eed2ca608	auto-update emacs compile-command to use gradle	2017-01-18 19:22:32 -08:00
Eric House	1f5ffaa712	more cleanup. Get Crittercism stuff compiling.	2017-01-18 19:03:36 -08:00
Eric House	0d1e22fc83	move wordlists and other assets over	2017-01-18 08:47:33 -08:00
Eric House	0750a771c3	move java files and get them to compile	2017-01-18 08:27:48 -08:00
Eric House	f090e86e26	move res files	2017-01-18 07:34:32 -08:00
Eric House	49242f78cf	more script fixes; move jni code	2017-01-18 07:27:23 -08:00
Eric House	612ff0259c	move and start processing res .xml files	2017-01-18 07:01:25 -08:00