Jason Monk e7beaf3efa resolve merge conflicts of 8cff199b09 to master ...

Change-Id: Ie61ca1bb88eadff30599c1776201482173479183

2017-01-18 15:09:42 -05:00

apct-tests/perftests

CriticalNative for RenderNode and DisplayListCanvas

2016-12-15 11:30:08 -08:00

api

Merge "System API for a proxy for registered players"

2017-01-18 18:19:32 +00:00

cmds

svc nfc should support watches too am: 1876583bfb am: eed0a7bf45

2017-01-18 16:47:59 +00:00

core

Merge "Validate custom pointer icons aren't null."

2017-01-18 19:44:58 +00:00

data

Add networkrecommendation permissions to privapp perms list.

2017-01-11 20:54:03 -08:00

docs

Introduce new UI_MODE_TYPE_VR_HEADSET and qualifier.

2017-01-11 11:44:47 -08:00

drm

Stop including libcore/include/ in most of frameworks/base.

2016-09-15 13:13:39 -07:00

graphics

Merge "Color API to create/store wide-gamut colors in a long"

2017-01-18 04:17:47 +00:00

keystore

Test for null context in getPrivateKey

2016-11-16 06:06:36 -07:00

legacy-test

Add legacy-android-test target containing android.test classes

2017-01-17 20:37:35 +00:00

libs

Merge "Update locale data from in-tree ICU"

2017-01-18 17:03:35 +00:00

location

GNSS O Features according to go/o-gps-hal

2017-01-15 18:02:21 -08:00

media

System API for a proxy for registered players

2017-01-17 15:42:42 -08:00

native

Unversion NDK stub libraries.

2017-01-06 11:04:14 -08:00

nfc-extras

…

obex

Allow getResponseCode to block if response hasn't been received from remote

2016-08-22 18:25:14 +00:00

opengl/java

Add EGL_RECORDABLE_ANDROID enum in EGLExt

2017-01-12 10:26:05 -08:00

packages

resolve merge conflicts of 8cff199b09 to master

2017-01-18 15:09:42 -05:00

proto

resolve merge conflicts of 8cff199b09 to master

2017-01-18 15:09:42 -05:00

rs

Merge "Rely on the platform -std default."

2016-10-08 21:45:16 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Validate custom pointer icons aren't null."

2017-01-18 19:44:58 +00:00

telecomm/java

Adding extra key to indicate when the last emergency call was made.

2017-01-10 20:56:23 +00:00

telephony/java

Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb am: ea0e111468

2017-01-17 19:59:43 +00:00

test-runner

Add install reason

2017-01-13 16:51:28 +01:00

tests

Merge changes from topic 'net-update-mr2-dev-plus-aosp' into nyc-mr2-dev-plus-aosp

2017-01-18 10:29:57 +00:00

tools

Merge "Update locale data from in-tree ICU"

2017-01-18 17:03:35 +00:00

wifi

Merge "Unhide WifiConfiguration proxy accessors"

2017-01-17 21:38:29 +00:00

Android.bp

AAPT2: Convert Android.mk to Android.bp

2017-01-13 18:56:55 -05:00

Android.mk

DO NOT MERGE: Switch over to new "time.android.com" NTP pool.

2017-01-18 19:08:35 +09:00

CleanSpec.mk

Rename MountService to StorageManagerService.

2016-11-15 12:43:37 -08:00

compiled-classes-phone

Remove unused classes from com.android.internal.widget

2017-01-10 17:17:19 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Move ContextHubService to a better location.

2016-12-21 11:33:28 -08:00

PREUPLOAD.cfg

Point to the new checkstyle location for frameworks/base PREUPLOAD hook.

2016-12-15 15:01:36 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%