Lorenzo Colitti 1142b2654a resolve merge conflicts of 51e4acb29d to nyc-dev ...

Also add the appropriate changes to api/test-current.txt, which
is not present on mm-wireless-dev from which this change came.

Change-Id: Ic4df6d0f89add73b7e5252ef662de07a4e8fce31

2016-02-24 15:19:15 +09:00

api

resolve merge conflicts of 51e4acb29d to nyc-dev

2016-02-24 15:19:15 +09:00

cmds

Fix a set of random warnings in frameworks/base/

2016-02-19 13:44:25 -08:00

core

resolve merge conflicts of 51e4acb29d to nyc-dev

2016-02-24 15:19:15 +09:00

data

Merge "Restore DroidSansFallback to fonts.xml"

2016-02-05 18:35:14 +00:00

docs

Remove deprecated APIs DPM.createUser, createAndInitializeUser

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

drm

Discourage use of "_data" column.

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

graphics

Merge "Support running AVD on UI thread" into nyc-dev

2016-02-23 22:43:53 +00:00

include

Make default resources a better match for en-US requests

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

keystore

Revert "Revert "Add option to allow key validity after fingerprint enrollment.""

2016-02-22 20:38:00 -07:00

libs

Merge "Fix drawColor/drawPaint bounds" into nyc-dev

2016-02-23 23:33:53 +00:00

location

Finalized GPS=>GNSS changes with documents

2016-02-19 16:59:28 -08:00

media

Merge "TIF: Add COLUMN_SEASON_TITLE and COLUMN_(SEASON|EPISODE)_DISPLAY_NUMBER" into nyc-dev

2016-02-24 02:09:03 +00:00

native

Change storage duration to static for native choreographer.

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

nfc-extras

…

obex

…

opengl/java

Fix reentrant deadlock in GLSurfaceView.

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

packages

Merge "Adapted the lockscreen style" into nyc-dev

2016-02-24 03:59:46 +00:00

proto

Merge "hide the nanos even harder" into nyc-dev

2016-02-23 18:25:14 +00:00

rs

[RenderScript] Fix potential leak in RS JNI

2016-02-17 11:01:51 -08:00

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of 51e4acb29d to nyc-dev

2016-02-24 15:19:15 +09:00

telecomm/java

Add new ConnectionEvent API (hide) to send a notification to Telecom

2016-02-16 14:36:20 -08:00

telephony/java

Merge "Create BandMode Constants" into mm-wireless-dev

2016-02-17 00:52:29 +00:00

test-runner

Make BackupManager encryption aware.

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

tests

Unload logic for generic and keyphrase sound models.

2016-02-22 15:19:44 -08:00

tools

Fix build breakage.

2016-02-22 15:11:49 -08:00

wifi/java/android/net/wifi

Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev

2016-02-23 19:09:24 +00:00

Android.mk

resolve merge conflicts of 51e4acb29d to nyc-dev

2016-02-24 15:19:15 +09:00

CleanSpec.mk

Fix local builds by adding CleanSpec command

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Support running AVD on UI thread

2016-02-23 14:40:47 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%