Ian Pedowitz 364e42edae resolve merge conflicts of f2304ce to nyc-mr1-dev ...

am: 637c0192fc

* commit '637c0192fcede4e91b4040bf9c486dfe1fb93d74':
  NYC is now REL

Change-Id: Id0a79354dedbe45304e7d93f650878c2ba184262

2016-06-03 19:50:41 +00:00

core

resolve merge conflicts of f2304ce to nyc-mr1-dev

2016-06-03 19:50:41 +00:00

libs/host

Remove LOCAL_ACP_UNAVAILABLE

2016-03-01 13:16:53 -08:00

target

Merge "Remove Dev Settings app from emulator images" into nyc-dev

2016-05-27 17:24:36 +00:00

tools

Merge "Add --dir option to findleaves.py" am: 40623e2a99 am: 1d7930b2be

2016-05-28 01:10:49 +00:00

.gitignore

Add build subprojects to .gitignore

2015-07-23 13:18:47 -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%