Jason Monk 6c2b26c8c0 Merge "Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: c178881033" into nyc-mr1-dev-plus-aosp ...

am: e0007e7dd4

* commit 'e0007e7dd4375441401592709182282ce57d0917':

Change-Id: Icb26fb11e0fca8e03f54a7bb0aa92d933002c9c2

2016-05-12 18:46:21 +00:00

api

Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f am: 2fc6bf3936

2016-05-12 17:29:11 +00:00

cmds

Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev

2016-05-06 21:42:47 +00:00

core

Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f am: 2fc6bf3936

2016-05-12 17:29:11 +00:00

data

…

docs

Merge "Adding the sdk_vars centralized file back to fix the ndk download page links" into mnc-mr-docs am: 77e85d32d6 am: 220f09fb4f

2016-05-12 17:13:47 +00:00

drm

…

graphics

Merge "Update and add attributes to the JavaDoc for VectorDrawable" into nyc-dev

2016-05-12 00:34:16 +00:00

include

Resource shared libraries: fix theme references

2016-05-10 10:45:52 -07:00

keystore

…

libs

Merge "Move gl calls from PatchCache to MeshState"

2016-05-12 01:22:14 +00:00

location

…

media

stephenli Manually merge commit '68fffa5'

2016-05-12 02:10:33 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Update demo mode time" into nyc-dev am: 341e37d349 am: 9f3141ebee

2016-05-12 18:43:40 +00:00

proto

resolve merge conflicts of 407c434 to nyc-mr1-dev

2016-05-12 12:45:29 -04:00

rs

Merge "[RenderScript] Interrupt mMessageThread when tearing down context." am: 9f2a1979a7

2016-05-11 19:32:00 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Don\'t disrupt a11y state when user is unlocked." into nyc-dev am: 18e9f13b24 am: 14a9987d99

2016-05-12 18:13:35 +00:00

telecomm/java

Add removeExtras(String...) prototype per API review.

2016-05-10 14:52:33 -07:00

telephony/java

Merge "Add new carrier config option for video conference support." into nyc-mr1-dev

2016-05-11 01:23:26 +00:00

test-runner

…

tests

Allow AmSlam to be used more widely

2016-05-11 23:17:16 -07:00

tools

Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev am: 8fc7ca05e5 am: 04b0d780bc

2016-05-11 16:04:17 +00:00

wifi/java/android/net/wifi

resolve merge conflicts of cbf3759 to master

2016-05-09 17:46:50 -07:00

Android.mk

…

CleanSpec.mk

…

compiled-classes-phone

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%