The Android Automerger 750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

api

Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3 am: 55f3776

2016-04-27 18:19:44 +00:00

cmds

resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp

2016-04-27 13:16:17 -07:00

core

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

data

…

docs

typo am: 3517069 am: 76f95c2

2016-04-27 21:25:00 +00:00

drm

…

graphics

Merge "API tweaks to PixelCopy and make it public" into nyc-dev

2016-04-27 14:36:53 +00:00

include

…

keystore

…

libs

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

location

…

media

Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115

2016-04-27 17:58:24 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

proto

…

rs

Merge "Fixed BaseObj finalizer and destroy()" into nyc-dev

2016-04-22 19:52:18 +00:00

samples/training/network-usage

…

sax

…

services

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

telecomm/java

…

telephony/java

Merge "Add CarrierConfig for metered roaming" into nyc-dev am: 73efde0

2016-04-26 23:16:18 +00:00

test-runner

…

tests

Merge "API tweaks to PixelCopy and make it public" into nyc-dev

2016-04-27 14:44:38 +00:00

tools

Merge "AAPT2: ProGuard config for components in main dex."

2016-04-22 23:28:39 +00:00

wifi/java/android/net/wifi

…

Android.mk

Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115

2016-04-27 22:14:50 +00:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Add compiled-classes

2016-04-26 19:14:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%