Chih-Hung Hsieh 05160d70d1 resolve merge conflicts of 5152fd9 to stage-aosp-master ...

Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3

2016-07-21 18:13:31 -07:00

api

Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a"

2016-07-11 10:08:40 +00:00

cmds

Merge \"Handle long process names correctly.\"

2016-07-19 00:19:15 +00:00

core

Merge \"Handle long process names correctly.\"

2016-07-19 00:19:15 +00:00

data

Merge "Move DownloadsManager to permanent whitelist." into nyc-dev

2016-06-01 22:45:33 +00:00

docs

resolve merge conflicts of ed6625d to stage-aosp-master

2016-07-21 11:43:15 -07:00

drm

…

graphics

Only block invalidation in DrawableContainer initialization

2016-06-17 13:08:42 -04:00

include

Merge \"Handle long process names correctly.\"

2016-07-19 00:19:15 +00:00

keystore

More thorough cleansing of expired users

2016-06-15 11:32:16 -07:00

libs

resolve merge conflicts of 5152fd9 to stage-aosp-master

2016-07-21 18:13:31 -07:00

location

Docs: Suppress errors in SystemApi Build

2016-06-01 16:13:53 -07:00

media

Merge \"Disable warning triggered in Clang r271374\"

2016-07-19 23:41:20 +00:00

native

resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp

2016-04-28 12:08:15 -07:00

nfc-extras

…

obex

Bluetooth: Send GET request as single packet

2016-06-15 23:06:31 +00:00

opengl/java

Make surfaceRedrawNeeded forgiving

2016-04-18 13:26:48 -07:00

packages

Settings: add logpersist kernel only selection (strings)

2016-07-08 14:31:22 -07:00

proto

add metrics for gestural notification expansions

2016-05-26 17:20:33 -04:00

rs

Merge \"Delete simple reduction implementation.\" into nyc-dev

2016-06-13 22:12:48 +00:00

samples/training/network-usage

…

sax

…

services

Merge \"Remove dependency on android_alarm.h.\"

2016-07-20 18:10:47 +00:00

telecomm/java

Handle Concurrency issues in Connection

2016-06-15 20:53:25 +00:00

telephony/java

Merge \"Add a key for setting carrier\'s CDMA roaming mode\" into nyc-dev

2016-06-14 17:15:41 +00:00

test-runner

ContextImpl: Keep DisplayAdjustments and Display in sync

2016-06-21 17:55:58 -07:00

tests

Merge \"Limit global drags to apps targeting SDK 24 and above\" into nyc-dev

2016-06-16 21:22:22 +00:00

tools

Merge \"Fix build due to missing abstract method impl\" into nyc-dev

2016-06-22 22:41:52 +00:00

wifi/java/android/net/wifi

Docs: Suppress errors in SystemApi Build

2016-06-01 16:13:53 -07:00

Android.mk

Merge \"Docs: Suppress errors in SystemApi Build Bug: 28427390\" into nyc-dev

2016-06-16 21:08:17 +00:00

CleanSpec.mk

Fix incremental build

2016-03-03 10:19:27 -08:00

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

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%