Yabin Cui 494c2b5ebc Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455 ... am: bebdc16a68 Change-Id: I60b9fb9437fe15079c62c3d47401341b54ebc7bc		2016-06-14 01:24:05 +00:00
core	Merge \\"Add option to link static lite protobuf library.\\" am: e6fae50455	2016-06-14 01:24:05 +00:00
libs/host	Switch some build tools to Soong	2016-06-06 14:51:52 -07:00
target	resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp	2016-06-09 05:46:40 +00:00
tools	Merge \\"More general OutputStreamDataSink.\\" am: dca955a9bd	2016-06-13 20:06:33 +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	Fix mm and mmm in Android.bp directories	2016-05-26 15:56:21 -07:00
envsetup.sh	Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624	2016-05-27 00:29:14 +00:00