Jason Monk d0ea9bafaa resolve merge conflicts of 8b3cb1b to nyc-mr1-dev ...

Change-Id: Ifc87af6444612f67cace41da9bb96d3283cf33b2

2016-05-11 11:35:46 -04:00

api

Merge "Fix AbstractStringBuilder gaining extra APIs." into nyc-dev

2016-05-11 09:35:13 +00:00

cmds

Move the 'pretend idle jobs can run now' broadcast into AMS

2016-05-06 11:25:11 -07:00

core

Fix crash in ResolverActivity

2016-05-11 14:57:37 +00:00

data

Merge "Additional alarm sounds for N" into nyc-dev

2016-04-28 22:14:02 +00:00

docs

fix redirects, as per linkchecker cl: https://critique.corp.google.com/#review/122012121 am: 0772f44acf am: 718d27d8dc

2016-05-11 05:11:32 +00:00

drm

…

graphics

Merge "Hold a ClassLoader reference in NativeAllocationRegistry." into nyc-dev

2016-05-09 15:50:30 +00:00

include

Resource shared libraries: fix theme references

2016-05-10 10:45:52 -07:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

libs

Resource shared libraries: fix theme references

2016-05-10 10:45:52 -07:00

location

Fixed the sign error in GnssClock

2016-04-08 14:10:42 -07:00

media

Merge "Fix javadoc missing possible return value in AudioRecordingConfiguration" into nyc-dev

2016-05-11 00:07:47 +00:00

native

Sensor: Add batch support for native applications

2016-03-16 18:07:00 -07:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

2016-04-18 13:26:48 -07:00

packages

Merge "Make collapsed QS work the same as expanded" into nyc-dev

2016-05-11 13:45:48 +00:00

proto

resolve merge conflicts of 8b3cb1b to nyc-mr1-dev

2016-05-11 11:35:46 -04:00

rs

Fixed BaseObj finalizer and destroy()

2016-04-22 10:21:18 -07:00

samples/training/network-usage

…

sax

…

services

Merge "Fix ConfirmCredential is not presented before trusting cert installed by PO/DO" into nyc-dev

2016-05-11 14:47:18 +00:00

telecomm/java

Add removeExtras(String...) prototype per API review.

2016-05-10 14:52:33 -07:00

telephony/java

Merge "Add new carrier config option for video conference support." into nyc-mr1-dev

2016-05-11 01:17:24 +00:00

test-runner

Disallow disable of the system shared libs.

2016-04-13 19:31:40 -07:00

tests

Merge "Add WebView scroll activity to UiBench" into nyc-dev

2016-05-10 23:31:22 +00:00

tools

Merge "AAPT2: Add diff command" into nyc-mr1-dev

2016-05-11 00:03:19 +00:00

wifi/java/android/net/wifi

Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev

2016-04-18 23:27:10 +00:00

Android.mk

Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c

2016-05-02 19:34:34 +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

Frameworks/base: Add holder to BaseBundle

2016-04-19 20:46:43 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%