Adam Seaton c88e5bdef3 Merge changes I5c252cba,I80259eef into mnc-dev am: ea6878b926 am: 2596931e86 am: cf896d4bcb am: d8dbdc0809 -s ours am: a0e65c2249 ... am: 5f77d46693 Change-Id: Ia9f81fc180122669361778a8acea5cb5f54d8df3		2017-04-13 22:55:28 +00:00
core	[DO NOT MERGE] Update Security String to 2017-06-05 for nyc-dev am: 70d708e29f	2017-04-12 22:52:19 +00:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync	2016-10-20 21:02:14 +00:00
tools	releasetools: Add support for --override_timestamp. am: 9f884e6c55	2017-03-16 23:24:13 +00:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
CleanSpec.mk	Add system_other partition, install odex files	2016-06-24 11:07:15 -07: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