Colin Cross 4bf50e486f resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp ...

Change-Id: Ifdf52646440b65ca4b3aadc8bba212b5f1fd0c0d

2016-02-18 22:27:04 -08:00

api

Merge "Introduce InputConnection#getHandler()." into nyc-dev

2016-02-19 02:36:50 +00:00

cmds

Added AM API to remove a stack

2016-02-16 10:09:51 -08:00

core

resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp

2016-02-18 22:27:04 -08:00

data

Merge "Add keylayout for Xbox One controller" am: 7416762be0

2016-02-17 22:55:10 +00:00

docs

Fix bug in IntentService and Service example code.

2016-02-16 17:37:36 +00:00

drm

Discourage use of "_data" column.

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

graphics

Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev

2016-02-18 19:06:20 +00:00

include

Make default resources a better match for en-US requests

2016-02-01 14:56:52 -08:00

keystore

Add support for extending key validity while on body.

2016-02-18 05:50:21 -07:00

libs

Merge "Revert "Revert "Revert "VectorDrawable native rendering - Step 5 of MANY"""" into nyc-dev

2016-02-18 19:06:20 +00:00

location

Optimized the memory consumption and renamed PRN

2016-02-11 11:29:40 -08:00

media

Merge "TIF: Unhide TvContract.Programs.Genres#isCanonical" into nyc-dev

2016-02-19 00:00:26 +00:00

native

Change storage duration to static for native choreographer.

2016-01-26 16:03:25 -08:00

nfc-extras

…

obex

OBEX: Handle GET operation properly

2015-05-16 01:19:19 +00:00

opengl/java

Fix reentrant deadlock in GLSurfaceView.

2016-01-26 18:26:46 +00:00

packages

Merge "Escape title of Operationdialog." into nyc-dev

2016-02-19 02:50:57 +00:00

proto

Importance slider logging.

2016-02-09 13:06:46 -05:00

rs

Merge "[RenderScript] Fix potential leak in RS JNI"

2016-02-17 19:05:07 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp

2016-02-18 22:27:04 -08:00

telecomm/java

Initialize MD5 in logging in background

2016-02-11 10:39:40 -08:00

telephony/java

Merge commit '26ada7e78993241d702a908eae93d174cbb3c8b3' into HEAD

2016-02-17 11:38:55 -08:00

test-runner

Make BackupManager encryption aware.

2016-02-18 10:54:11 -07:00

tests

Suppressed unused parameter warnings in frameworks/base/tests/Camera2Tests

2016-02-18 14:06:58 -08:00

tools

Merge "Make BackupManager encryption aware." into nyc-dev

2016-02-18 19:26:36 +00:00

wifi/java/android/net/wifi

[NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]

2016-02-18 23:48:59 +00:00

Android.mk

[NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]

2016-02-18 23:48:59 +00:00

CleanSpec.mk

Fix local builds by adding CleanSpec command

2016-01-19 11:39:24 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Preloaded classes for N

2016-02-18 17:29:35 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%