Colin Cross 1ed08efbb9 Merge "Ignore Android.mk files with USE_SOONG=true" ... am: 19f6638026 * commit '19f6638026b8481e04003fcbd5a8ef017a66d9c8': Ignore Android.mk files with USE_SOONG=true		2016-01-13 20:43:22 +00:00
core	Merge "Ignore Android.mk files with USE_SOONG=true"	2016-01-13 20:43:22 +00:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	Merge "Remove special case handling of "ro." properties"	2016-01-12 20:54:38 +00:00
tools	Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher."	2016-01-13 18:46:25 +00:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
CleanSpec.mk	Fix issie #23116383: Include security patch level in Settings	2015-08-12 16:29:08 -07:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	Merge "Use sensible default locations for Java"	2015-11-20 10:16:17 +00:00