TreeHugger Robot fa8d696556 Merge "Don\'t lose content change during rollback for loader already started" into nyc-dev am: 8ff7d16 ...

am: a3aef2a

* commit 'a3aef2a2b1d8805fe2f1f0a672a56d1e2124a734':
  Don't lose content change during rollback for loader already started

Change-Id: I7952477bc2bdfdee004963a38169bd316baac150

2016-04-27 23:40:26 +00:00

api

Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3

2016-04-27 18:11:30 +00:00

cmds

resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp

2016-04-27 13:16:17 -07:00

core

Merge "Don\'t lose content change during rollback for loader already started" into nyc-dev

2016-04-27 23:31:37 +00:00

data

…

docs

typo am: 3517069 am: 76f95c2

2016-04-27 21:25:00 +00:00

drm

…

graphics

Merge "API tweaks to PixelCopy and make it public" into nyc-dev

2016-04-27 14:36:53 +00:00

include

…

keystore

Resolve merge conflicts of a5060ee to nyc-dev

2016-04-19 02:03:59 -07:00

libs

Merge "Fix oval positioning when drawn with patheffect" into nyc-dev

2016-04-27 21:05:28 +00:00

location

…

media

Merge "Remove MediaDrm stack from mediaserver" into nyc-dev

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

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Fix remote input view clobbering" into nyc-dev

2016-04-27 23:31:30 +00:00

proto

…

rs

Merge "Fixed BaseObj finalizer and destroy()" into nyc-dev

2016-04-22 19:52:18 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Fix issue #28403313: Improve package manager query commands" into nyc-dev am: 62e7d26

2016-04-27 20:51:27 +00:00

telecomm/java

…

telephony/java

Merge "Add CarrierConfig for metered roaming" into nyc-dev am: 73efde0

2016-04-26 23:16:18 +00:00

test-runner

…

tests

Merge "API tweaks to PixelCopy and make it public" into nyc-dev

2016-04-27 14:44:38 +00:00

tools

Merge "Disallow disable of the system shared libs." into nyc-dev am: 5a91b61

2016-04-22 21:09:55 +00:00

wifi/java/android/net/wifi

Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev

2016-04-18 23:27:10 +00:00

Android.mk

Merge "resolve merge conflicts of 0d00d28 to nyc-dev" into nyc-dev

2016-04-27 21:20:57 +00:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Add compiled-classes

2016-04-26 19:14:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Add holder to BaseBundle

2016-04-19 20:46:43 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%