Trevor Johns 18c202a7d3 Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev		2016-04-12 17:59:02 +00:00
core	Merge "Ensure prebuilt executables are executable" into nyc-dev	2016-04-11 19:59:10 +00:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	Merge "Add ext libs to core_tiny, they're needed for wear PDK" into nyc-dev	2016-04-12 01:31:47 +00:00
tools	Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev	2016-04-12 17:59:02 +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	Small fixes.	2016-03-04 14:02:25 -08:00