Xin Li 4cb2741230 resolve merge conflicts of b9d266f to nyc-dev-plus-aosp ...

Change-Id: I1580d3c108d1f0b57f75b27d67e229f8b314a72a

2016-06-06 10:48:59 -07:00

api

Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev

2016-06-03 19:27:36 +00:00

cmds

Merge "Deprecate shell-based UI Automator." into nyc-dev

2016-05-24 21:36:20 +00:00

core

Merge "Revert "Revert "Finalize resource IDs for N.""" into nyc-dev

2016-06-03 19:27:36 +00:00

data

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev

2016-06-01 22:45:33 +00:00

docs

Merge "docs: Fix code sample in /work: Set up Single-Purpose Devices am: f4973c28a5 am: 90ee70e519" into nyc-dev

2016-06-03 18:57:25 +00:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

Copy native tree's property when mutate vector drawable

2016-05-27 10:54:55 -07: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 "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev

2016-06-02 01:44:06 +00:00

location

Adding SBAS offset to Gps/Gnss SvStatus converter

2016-05-24 09:25:02 -07:00

media

media: fix issues with video profile levels

2016-06-02 03:57:49 +00:00

native

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

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

packages

Merge "New non-priv prebuilt" into nyc-dev

2016-06-06 16:45:59 +00:00

proto

add metrics for gestural notification expansions

2016-05-26 17:20:33 -04: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 b9d266f to nyc-dev-plus-aosp

2016-06-06 10:48:59 -07:00

telecomm/java

Remove PROPERTY_WORK_CALL

2016-05-20 19:56:08 +00:00

telephony/java

Merge "Add carrier config variables for overriding carrier name from carrierconf." into nyc-dev

2016-06-02 23:15:57 +00:00

test-runner

Un-deprecated Android mock testing APIs

2016-05-25 22:54:27 +00:00

tests

Merge "Change overdraw test to use windowbackground" into nyc-dev

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

tools

Merge "Workaround to display menus for AppCompat themes" into nyc-dev

2016-05-25 16:47:47 +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 am: c25a9b0104

2016-05-02 19:39:03 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

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%