Jason Monk e6d0ef984a Merge \\"QS: Fix leak in QSAnimator\\" into nyc-dev am: 883da638e2 ...

am: d97d435c09

Change-Id: I62c2c08e956a59e9c6cee2397a003cff960eb5d1

2016-06-08 19:44:48 +00:00

api

resolve merge conflicts of c33507d to nyc-mr1-dev-plus-aosp

2016-06-08 11:50:57 -07:00

cmds

…

core

Merge \\"Return correct default theme on API >= 24\\" into nyc-dev am: afaa1e9db1

2016-06-08 18:59:14 +00:00

data

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev am: 31e3b14d6a

2016-06-01 23:02:47 +00:00

docs

Merge "docs: Updates for picture-in-picture docs for N DP4" into nyc-dev

2016-06-08 16:22:27 +00:00

drm

…

graphics

Copy native tree's property when mutate vector drawable

2016-05-27 10:54:55 -07:00

include

…

keystore

…

libs

Merge "HWUI: do not call glCopyTexSubImage2D on empty area." into nyc-dev

2016-06-02 01:44:06 +00:00

location

…

media

Merge "Delete Visualizer before lpJniStorage" am: 03c209b2a3

2016-06-07 18:13:09 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge \\"QS: Fix leak in QSAnimator\\" into nyc-dev am: 883da638e2

2016-06-08 19:44:48 +00:00

proto

Give the auto-merger somthing to hang on to.

2016-06-02 15:11:48 -04:00

rs

…

samples/training/network-usage

…

sax

…

services

Merge \\"Handle alarm firing outside of DND period.\\" into nyc-dev am: e1451c4e30

2016-06-08 18:59:12 +00:00

telecomm/java

Adds CDMA Voice Privacy Property to Call

2016-06-03 13:34:07 -07:00

telephony/java

Merge "Fix bug while writing data to parcel in TelephonyHistogram.java" into nyc-mr1-dev

2016-06-07 21:00:49 +00:00

test-runner

…

tests

Merge "Add new attributes for wallpaper info" into nyc-mr1-dev

2016-06-04 00:27:04 +00:00

tools

Merge "Allow uses-library under <application>" into nyc-mr1-dev

2016-06-03 00:38:23 +00:00

wifi/java/android/net/wifi

…

Android.mk

Merge "Add support for UNSOL PCO Data." into nyc-mr1-dev

2016-06-03 16:44:29 +00:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

2016-06-07 03:12:03 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Update preloaded-classes

2016-06-06 14:58:44 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%