Gustav Sennton c4446568cc resolve merge conflicts of 00b735a to master ...

Change-Id: Ief4ed37cf8de3e2d4279a1267717dd6a54702b7c

2016-05-24 12:54:11 +01:00

api

Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev am: d15cc7a83e am: 80c470bd52

2016-05-23 23:38:16 +00:00

cmds

Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev

2016-05-19 21:01:30 +00:00

core

resolve merge conflicts of 00b735a to master

2016-05-24 12:54:11 +01:00

data

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

2016-04-28 22:24:11 +00:00

docs

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

2016-05-20 15:39:38 +00:00

drm

…

graphics

Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681

2016-05-18 02:25:10 +00:00

include

Performance improvements in AssetManager

2016-05-20 15:04:09 -07:00

keystore

Resolve merge conflicts of a5060ee to nyc-dev

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

libs

Merge "Performance improvements in AssetManager" into nyc-dev am: 3765d34d36 am: 2b798a2344

2016-05-21 00:22:01 +00:00

location

Mapping up/down of legacy Gps vs. Gnss Status

2016-05-19 09:55:42 -07:00

media

Merge "Recording activity notification: return list of configuration" into nyc-dev am: c991879f29 am: f2c8fb8620

2016-05-23 21:59:29 +00:00

native

Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp

2016-04-28 19:46:13 +00:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

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

packages

Merge "PIP: Handle configuration changes" into nyc-dev am: 75822138ad am: b917a0e6be

2016-05-24 00:39:28 +00:00

proto

Add Tron Logging to Keyboard Shortcuts Helper

2016-05-18 15:39:24 +01:00

rs

Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev

2016-05-19 22:24:27 +00:00

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of 00b735a to master

2016-05-24 12:54:11 +01:00

telecomm/java

Merge "Remove PROPERTY_WORK_CALL" into nyc-dev

2016-05-23 17:26:45 +00:00

telephony/java

Merge "Add API setAllowedCarriers, getAllowedCarriers to TelephonyManager" into nyc-mr1-dev

2016-05-20 22:21:26 +00:00

test-runner

Disallow disable of the system shared libs.

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

tests

Create frameworks-base-testutils lib

2016-05-19 13:12:09 -07:00

tools

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

wifi/java/android/net/wifi

[NAN] Add retry count for transmitting L2 NAN messages

2016-05-24 01:28:04 +00:00

Android.mk

Merge "Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 am: 4569e9515c am: 48d8747041" into nyc-mr1-dev-plus-aosp

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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%