The Android Automerger 1ec2fd72ce stephenli@ manually merge many commits up to '032dcff' ...

* commit '032dcff': (22 commits)
  Remove outdated google services links.
  Fix misc-macro-parentheses warnings in services jni.
  Fix misc-macro-parentheses warnings in hwui and graphic jni.
  Fix misc-macro-parentheses warnings in aapt and androidfw.
  docs: Update to column widths for Complications table
  Fix a11y crash when window layer isn't unique.
  Never set resized while not drag resizing for pinned stack.
  While turning OFF do not honor ON requests.
  Fix GATT autoConnect race condition
  Fix GATT autoConnect race condition
  Fix RTL issue in delete dialog.
  Incorporate feedback on new wallpaper-related APIs
  Mapping up/down of legacy Gps vs. Gnss Status
  Fixed a bug where the chronometer was invisible
  Fixed a bug where the chronometer wasn't updating the time
  Update BlockedNumberContract javadocs.
  [RenderScript] Fix ScriptIntrinsicBlur documentation.
  Update documentation about copyTo and copyFrom.
  DO NOT MERGE Cherry pick libpng usage fixes
  Start the Wear Time System Service with SystemServer
  ...

2016-05-19 23:51:32 +00:00

api

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

cmds

Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev

2016-05-19 21:01:30 +00:00

core

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

data

Merge "Additional alarm sounds for N" into nyc-dev

2016-04-28 22:24:11 +00:00

docs

Merge "Remove outdated google services links." into mnc-mr-docs am: dc40b80ae9 am: 5fb577e6bc

2016-05-19 23:19:12 +00:00

drm

Discourage use of "_data" column.

2016-01-06 10:19:35 -07:00

graphics

Merge "Move LocaleList to avoid layering violation." into nyc-dev am: 31884efd13 am: ddaf3f4681

2016-05-18 02:25:10 +00:00

include

Resource shared libraries: fix theme references

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

keystore

Resolve merge conflicts of a5060ee to nyc-dev

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

libs

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

location

Mapping up/down of legacy Gps vs. Gnss Status

2016-05-19 09:55:42 -07:00

media

Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev am: c4e8471ba4 am: 8a53cc9e26

2016-05-17 21:49:21 +00:00

native

Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp

2016-04-28 19:46:13 +00:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

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

packages

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

proto

Add Tron Logging to Keyboard Shortcuts Helper

2016-05-18 15:39:24 +01:00

rs

Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev

2016-05-19 22:24:27 +00:00

samples/training/network-usage

…

sax

…

services

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

telecomm/java

Add null pointer check in removeConnection am: e370b538eb am: 58642e6545

2016-05-18 20:41:10 +00:00

telephony/java

Merge "Continued multi-endpoint work." into nyc-mr1-dev

2016-05-18 20:32:33 +00:00

test-runner

Disallow disable of the system shared libs.

2016-04-13 19:31:40 -07:00

tests

Create frameworks-base-testutils lib

2016-05-19 13:12:09 -07:00

tools

stephenli@ manually merge many commits up to '032dcff'

2016-05-19 23:51:32 +00:00

wifi/java/android/net/wifi

resolve merge conflicts of fb8021c to master

2016-05-18 16:54:29 -07:00

Android.mk

Merge "Merge "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104 am: 4569e9515c am: 48d8747041" into nyc-mr1-dev-plus-aosp

2016-05-02 19:48:56 +00:00

CleanSpec.mk

Fix incremental build

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

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%