Andrew Scull 1232590006 Merge "resolve merge conflicts of ad4aa1ce7d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1 am: 3c9b36482f" into nyc-mr2-dev-plus-aosp ...

am: 0877a45f02

Change-Id: I8b4a708f5204346e791f5450bfaa4501afa3704b

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

apct-tests/perftests

…

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

…

graphics

Expose SurfaceControl method to screenshot to GraphicBuffer.

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

keystore

…

legacy-test

…

libs

Merge changes from topic 'vrmode'

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

location

…

media

resolve merge conflicts of 082a1721b5 to master

2017-01-11 08:30:17 -08:00

native

…

nfc-extras

…

obex

…

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

…

samples/training/network-usage

…

sax

…

services

Merge changes from topic 'vrmode'

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

telecomm/java

…

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

…

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

…

Android.mk

…

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

PREUPLOAD.cfg

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%