Alex Light a3e8e9c6f3 resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp ...

Bug: 29278988

Change-Id: Icffb9a280311c7d3c45f096243ddf18f7ebecd9d

2016-06-29 15:43:54 -07:00

core

resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp

2016-06-29 15:43:54 -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

resolve merge conflicts of 3f7c348 to nyc-mr1-dev-plus-aosp

2016-06-29 15:43:54 -07: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

Description

No description provided

104 MiB

Languages

Makefile 32.1%

Python 31.1%

Go 13.7%

Rust 7.7%

Java 5.2%

Other 10.1%