Tianjie Xu 3e8413a959 resolve merge conflicts of 8532aa4 to nyc-mr1-dev-plus-aosp ... am: 94a41630ef Change-Id: Idac23ca3a5d50f4426f40e9806f910eaf8aff913		2016-08-24 23:39:50 +00:00
core	Merge "Allow selection of prebuilts min sdk" am: 624619d4d0 am: 1d7e0f2c74 am: 51403950b3	2016-08-24 10:04:44 +00:00
target	Merge \\\"The easter egg is now its own APK.\\\" into nyc-dev am: 18ecea3986 am: 377d5bdb3f	2016-06-26 23:07:28 +00:00
tools	resolve merge conflicts of 8532aa4 to nyc-mr1-dev-plus-aosp	2016-08-24 23:39:50 +00:00
.gitignore	Add build subprojects to .gitignore	2015-07-23 13:18:47 -07:00
Android.mk	Add new Android.mk to handle repo move	2016-06-16 15:30:19 -07:00
CleanSpec.mk	Add system_other partition, install odex files	2016-06-24 11:07:15 -07:00
buildspec.mk.default	Fix GET-INSTALL-PATH to work with Soong	2016-08-12 05:10:51 +00:00
envsetup.sh	Merge "Fix GET-INSTALL-PATH to work with Soong"	2016-08-15 21:17:33 +00:00