Android Build Merger (Role) 2ae3c282d5 Merge "DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb am: 9606ea8a43 -s ours am: 3c42a21466 am: 4c8e743fa5" into nyc-mr1-dev-plus-aosp		2016-05-19 17:00:46 +00:00
core	Merge "Windows: Stop adding to GLOBAL_LD_DIRS" am: e23a49157f am: 84eb1d2cca	2016-05-19 01:28:57 +00:00
libs/host	Remove LOCAL_ACP_UNAVAILABLE	2016-03-01 13:16:53 -08:00
target	Build: Use phone compiled-classes in core_minimal	2016-05-19 05:10:55 +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	resolve merge conflicts of 72b82dc to nyc-dev-plus-aosp	2016-04-25 15:27:21 -07:00