Dan Willemsen 8434156634 resolve merge conflicts of bfbcc0e to nyc-mr1-dev-plus-aosp ... Change-Id: Iff6b808f5220050a876bc21fc0d221523d549976		2016-06-29 14:14:14 -07:00
core	resolve merge conflicts of bfbcc0e to nyc-mr1-dev-plus-aosp	2016-06-29 14:14:14 -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 \\\"Skip copying existing vendor images\\\" am: 1767d3f918 am: 85da4d3566	2016-06-29 18:50:53 +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	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