Adam Seaton 95f77a84d9 Merge changes I46d9d8c1,I1ea15c14 into nyc-dev ... * changes: [DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev bug:38342695 [DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev bug:38342695		2017-05-23 17:29:00 +00:00
core	[DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev	2017-05-17 11:27:05 -07:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	The easter egg is now its own APK.	2016-06-26 18:07:59 +00:00
tools	releasetools: Add support for --override_timestamp.	2017-03-16 11:26:06 -07:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
CleanSpec.mk	Merge "CleanSpec: Clean up /recovery/root/sdcard." am: b69d3b28a5	2016-01-22 18:53:15 +00:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	build rule change for VTS (vendor test suite)'s metadata files	2016-04-25 13:06:57 -07:00