Joe Bowser fae39dd2e5 Merge branch 'master' into 6.4.x ... Merging all non-StudioProjectCompat work into the 6.4.x branch for possible 6.x, or 6.4.x work in the future.		2017-11-28 10:39:54 -08:00
..
assets/www	Merge branch 'master' into 6.4.x	2017-11-28 10:39:54 -08:00
res	CB-13610: Compress the default app assets	2017-11-27 22:46:02 -08:00
Activity.java	Fix tab/space issue	2016-10-12 22:21:14 -04:00
AndroidManifest.xml	CB-8722 - Move icons from drawable to mipmap	2016-10-11 13:29:15 -07:00
build.gradle	Merge pull request #401 from fabulant/CB-8976	2017-11-27 14:02:20 -08:00
gitignore	CB-7726 fix typo in gitignore: ant-built -> ant-build	2014-10-27 12:33:09 -04:00
project.properties	CB-7330 Don't run "android update" during creation	2014-08-18 23:24:29 -04:00
wrapper.gradle	CB-12524: Put the script in the wrong spot, oops	2017-03-13 13:51:37 -07:00