Andrew Scull c4347a5450 resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 3c9b36482f ...

am: 8203155664  -s ours

Change-Id: I920c10e52faef95e0d3d55e075fdc85610b358c0

2017-01-14 00:28:39 +00:00

apct-tests/perftests

CriticalNative for RenderNode and DisplayListCanvas

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

api

Merge changes from topic 'vrmode'

2017-01-13 23:15:00 +00:00

cmds

Added BUGREPORT_OPTION_TELEPHONY.

2017-01-11 23:09:01 +00:00

core

Merge changes from topic 'vrmode'

2017-01-13 23:15:00 +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

Expose SurfaceControl method to screenshot to GraphicBuffer.

2017-01-12 11:16:34 -08:00

keystore

Test for null context in getPrivateKey

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

legacy-test

Copy core-junit files into legacy-test.

2016-12-14 14:19:08 +00:00

libs

Merge changes from topic 'vrmode'

2017-01-13 23:15:00 +00:00

location

Removing @removed methods and constants

2016-12-23 13:18:16 -08:00

media

resolve merge conflicts of 082a1721b5 to master

2017-01-11 08:30:17 -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

Merge "move PreferenceController into settingLib/core"

2017-01-13 21:59:15 +00:00

proto

Create a global registry for system message IDs

2017-01-12 21:23:11 +00:00

rs

Merge "Rely on the platform -std default."

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

samples/training/network-usage

…

sax

…

services

Merge changes from topic 'vrmode'

2017-01-13 23:15:00 +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 "Default Carrier app for traffic mitigation" am: 4533b1ccdd am: 1d0877f59e am: c90dc2072c

2017-01-13 21:38:45 +00:00

test-runner

Add API for apps to declare their "category".

2017-01-12 09:53:44 -07:00

tests

Merge "Create a new jank test to measure HW layer resize performance"

2017-01-09 18:50:56 +00:00

tools

Merge changes from topic 'vrmode'

2017-01-13 23:15:00 +00:00

wifi

DO NOT MERGE: Fix to maintain the Carrier Network connection.

2017-01-13 20:58:09 +00:00

Android.bp

Fix vulnerability in MemoryIntArray

2016-12-07 22:43:56 +00:00

Android.mk

YAMAFFR - Yet Another Major AutoFill Framework Refactoring

2017-01-10 12:50:47 -08:00

CleanSpec.mk

Rename MountService to StorageManagerService.

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

compiled-classes-phone

Merge "Add a mechanism for configuring the A2DP Source codecs" am: 63270f2b96 am: 8b46f87e7e am: da3de76bdb

2017-01-04 03:54:18 +00: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%