Colin Cross 4cca8a5573 resolve merge conflicts of 1e92cfb to stage-aosp-master ...

Change-Id: I1929d5c16ea0b8574372049ac7dffd30fd3e1db3

2016-07-15 14:49:45 -07:00

core

resolve merge conflicts of 1e92cfb to stage-aosp-master

2016-07-15 14:49:45 -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 \"Fix root_filesystem_config.txt generation\"

2016-07-13 23:15:12 +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

Merge "CleanSpec: Clean up /recovery/root/sdcard." am: b69d3b28a5

2016-01-22 18:53:15 +00: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%