Allen Hair 49fd8a24f3 Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev ... am: 1f44c26b1e Change-Id: I25d45b0d0d490d6cc3f80871fcf69bd9f1857216		2016-06-28 17:53:00 +00:00
core	Merge \"DO NOT MERGE Skip emma instrumentation if we\'re using jack.\" into nyc-dev	2016-06-28 17:53:00 +00:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	Merge \"The easter egg is now its own APK.\" into nyc-dev	2016-06-26 22:56:03 +00:00
tools	Merge "Avoid writing too much new data per transfer" into nyc-mr1-dev	2016-06-24 18:06:22 +00: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