Benoit Lamarche cd859b6ec6 resolve merge conflicts of e04c941 to stage-aosp-master am: 0e61b46673 am: dd80dde8d2 ...

am: 0de297d254

Change-Id: I778834c1e64a189b1d722fdc1ff2eada5a889c89

2016-12-06 11:19:39 +00:00

core

Merge "Set platform min sdk for Jack to o-b1"

2016-12-06 09:25:46 +00:00

target

Merge "add mediaanalytics service to build"

2016-12-03 00:49:31 +00:00

tools

Manually merge commit 'c13da91' into stage-aosp-master am: ada51f3b8f am: 13f3b5337a

2016-12-03 04:19:54 +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 GET-INSTALL-PATH to work with Soong

2016-08-12 05:10:51 +00:00

CleanSpec.mk

Prohibit host modules from using LOCAL_COPY_HEADERS

2016-11-29 20:42:37 +00:00

envsetup.sh

Merge "Add bit helper utility"

2016-10-21 17:55:42 +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%