Dan Willemsen 822f20f933 Merge "Diff .art/.oat/.odex files now that they are deterministic" ... am: 78861d7e6e * commit '78861d7e6e56a770eb6c50370aa405992a3fab4c': Diff .art/.oat/.odex files now that they are deterministic		2016-02-01 22:42:50 +00:00
core	Merge "Don\'t force color diagnostics outside of ninja"	2016-02-01 19:02:07 +00:00
libs/host	Clean up Mac OS hacks in acp slightly.	2016-01-05 09:32:42 -08:00
target	Merge "README: Update docs"	2016-01-26 23:51:39 +00:00
tools	Merge "Diff .art/.oat/.odex files now that they are deterministic"	2016-02-01 22:42:50 +00:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
CleanSpec.mk	CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.	2016-01-21 17:18:47 -08:00
buildspec.mk.default	Remove WEBCORE_INSTRUMENTATION and ENABLE_SVG	2013-07-25 15:52:17 -07:00
envsetup.sh	Revert "Revert "Make OpenJDK 8 the default""	2016-01-25 17:12:41 +00:00