No description

Dan Willemsen f666e4d385 resolve merge conflicts of 61ada12 to nyc-mr1-dev-plus-aosp ... Change-Id: I0a39db916843b7cb034af4390d760d39307e1d14		2016-07-29 20:33:33 -07:00
core	resolve merge conflicts of 61ada12 to nyc-mr1-dev-plus-aosp	2016-07-29 20:33:33 -07:00
target	Merge \\"The easter egg is now its own APK.\\" into nyc-dev am: 18ecea3986	2016-06-26 23:03:00 +00:00
tools	Merge \\\"Handle multiple APKs from the same package in check_target_files_signatures.py.\\\" am: 653980bfe4 am: 88f7e6a867	2016-07-28 04:46:47 +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
buildspec.mk.default	Fix mm and mmm in Android.bp directories	2016-05-26 15:56:21 -07:00
CleanSpec.mk	Add system_other partition, install odex files	2016-06-24 11:07:15 -07:00
envsetup.sh	Merge "Fix mm and mmm in Android.bp directories" am: 8ed91b6624	2016-05-27 00:29:14 +00:00