Derek Sollenberger cab9d4e199 resolve merge conflicts of 928b30a to master ...

Change-Id: I476d653a00e62d171f29e1d5a2f800a0f3a75f00

2016-03-25 13:59:36 -04:00

api

Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev am: ebf3976

2016-03-25 17:08:26 +00:00

cmds

Merge "resolve merge conflicts of 0c7535b to nyc-dev" into nyc-dev

2016-03-25 01:11:19 +00:00

core

Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev am: ebf3976

2016-03-25 17:08:26 +00:00

data

Merge "Add emoji-related tests for the font chain" into nyc-dev

2016-03-17 17:35:20 +00:00

docs

Document restricted app private file permissions

2016-03-23 10:33:35 +00:00

drm

Discourage use of "_data" column.

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

graphics

Merge "Fix javadoc for Icon.loadDrawableAsync(Context, OnDrawableLoadedListener, Handler)." into nyc-dev

2016-03-25 16:17:03 +00:00

include

AssetManager: Cache a pre-filtered list of configurations

2016-03-09 17:33:14 -08:00

keystore

Merge "Use canonical name for SHA1withECDSA" am: 4a0497c

2016-03-23 21:40:50 +00:00

libs

resolve merge conflicts of 928b30a to master

2016-03-25 13:59:36 -04:00

location

Merge "A few changes to the measurement implementation" into nyc-dev

2016-03-22 23:08:39 +00:00

media

Merge "Add getObjectSizeLong hidden API to MtpDevice class." into nyc-dev am: a2b88f6

2016-03-25 13:08:26 +00:00

native

Merge "Sensor: Add batch support for native applications" into nyc-dev am: 9c2e644

2016-03-17 19:23:55 +00:00

nfc-extras

…

obex

…

opengl/java

Merge "Fix glGetTransformFeedbackVarying JNI" into nyc-dev

2016-02-29 22:58:56 +00:00

packages

Merge "Change hasCustomPrintIcon and setStatus as requested by API council." into nyc-dev am: ebf3976

2016-03-25 17:08:26 +00:00

proto

Allow Scoped Directory Access on whole volume.

2016-03-21 14:25:17 -07:00

rs

Correctly init code cache path for RS

2016-03-21 16:53:22 -07:00

samples/training/network-usage

…

sax

…

services

Merge "Delete app profiles only during updates and uninstalls" into nyc-dev am: e1cf49e

2016-03-25 17:08:29 +00:00

telecomm/java

Add connection properties to Connections.

2016-03-24 20:20:11 -07:00

telephony/java

Merge "Add connection properties to Connections." into nyc-dev

2016-03-25 03:51:27 +00:00

test-runner

Refactoring FBE APIs based on council feedback.

2016-03-17 14:49:08 -06:00

tests

Properly handle whitespace in domain entries

2016-03-23 15:28:41 -07:00

tools

Merge "Add Lang-to-Script entries for languages with new hyph patterns" into nyc-dev

2016-03-25 00:35:08 +00:00

wifi/java/android/net/wifi

Merge "WifiConfiguration: Remove dead commented code" into nyc-dev am: 0a835f6

2016-03-25 03:48:46 +00:00

Android.mk

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

2016-03-23 22:40:16 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%