Rob Carr 88df0dd3ef Merge "Fix crash when docking." into nyc-dev am: 45ee78c ...

am: 6ad9739

* commit '6ad97390a3e319e32107ebaaacb6c273211d2153':
  Fix crash when docking.

Change-Id: Ic99f5ffe1c2e49cdc6503afefa9482e9b534d0d9

2016-04-27 22:13:36 +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 "Fix crash when docking." into nyc-dev

2016-04-27 22:06:54 +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

…

libs

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

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

location

…

media

…

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

Merge "Merge "Add a missing null object check" into nyc-dev am: 44cc663" into nyc-mr1-dev

2016-04-27 21:30:16 +00:00

proto

…

rs

…

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

…

test-runner

…

tests

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

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

tools

…

wifi/java/android/net/wifi

…

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

…

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%