Andreas Gampe ae492fd5f2 resolve merge conflicts of 9d73af0 to stage-aosp-master ... Change-Id: I984c48310e72cb509b859501cfb07258214038fa		2016-06-30 21:42:44 -07:00
core	resolve merge conflicts of 9d73af0 to stage-aosp-master	2016-06-30 21:42:44 -07:00
target	Merge \"The easter egg is now its own APK.\" into nyc-dev	2016-06-26 22:56:05 +00:00
tools	Merge \"Skip copying existing vendor images\"	2016-06-29 18:45:57 +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