Alex Light 8ec3465ffa Merge "Add fake libart" am: 49a4be8130 am: c7e74a370a am: 8354ee5e9d ... am: 1313e5416a * commit '1313e5416a077413ab7f69bd81b8108820018ba2': Add fake libart Change-Id: I97cf1ace07771a2946a405f432e5767da5aebde0		2016-05-18 21:25:02 +00:00
core	Merge "Remove (TARGET|HOST)_NO_UNDEFINED_LDFLAGS" am: ac7a7bb0ba am: 611211acd4 am: c7f377721a	2016-05-18 21:00:14 +00:00
libs/host	Remove LOCAL_ACP_UNAVAILABLE	2016-03-01 13:16:53 -08:00
target	Merge "Add CtsShimPrebuilt" into nyc-dev am: 85c33f500a am: 5742010b85	2016-05-17 00:48:18 +00:00
tools	docs: work minisite am: 09304b21b3 am: 05f772fe6b	2016-05-16 22:26:58 +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 make variables exported from Soong	2016-05-16 20:39:58 -07:00
envsetup.sh	Merge "resolve merge conflicts of 75a72a1 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp	2016-04-25 23:02:45 +00:00