smain@google.com f5bc587bfa Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc am: ccf143ea10 am: eaad66b697 ...

am: d1515a26e8

* commit 'd1515a26e8a2ccfc04e55c9ad84ac5adcad410ca':
  fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246

Change-Id: Ide9ab23c3241852d9b2321c08e15cb38bda83197

2016-05-20 00:26:46 +00:00

api

Merge "Incorporate feedback on new wallpaper-related APIs" into nyc-dev

2016-05-19 19:44:42 +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

resolve merge conflicts of 404e2b2 to nyc-dev-plus-aosp

2016-05-19 23:29:27 +00:00

data

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

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

docs

Merge "fix dashboards page. the src attributes were being modified by the devsite parser, so i renamed those attributes then rename them again at runtime. bug: 28801246" into mnc-mr-docs am: 486f792d44 am: 9ad92619dc

2016-05-20 00:14:02 +00:00

drm

…

graphics

Move LocaleList to avoid layering violation.

2016-05-17 16:42:58 -07: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

Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169

2016-05-19 23:34:58 +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

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

native

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

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

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

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

packages

Merge "Fixed a bug where the chronometer was invisible" into nyc-dev am: 2486cb2c89

2016-05-19 20:54:37 +00:00

proto

Add new action for the storage manager settings.

2016-05-13 12:10:00 -07:00

rs

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

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

samples/training/network-usage

…

sax

…

services

Merge "Fix misc-macro-parentheses warnings in services jni." am: fe91d2a83d am: d05b6478d5

2016-05-19 23:39:56 +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

Merge "Switch the default text selection handles to Material style." into nyc-dev

2016-05-12 00:56:14 +00:00

tools

Merge "Fix misc-macro-parentheses warnings in aapt and androidfw." am: 6f4b566169 am: f55c9f7aa6

2016-05-19 23:39:59 +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 "Pass -yaml to ds builds to generate _book.yaml version of reference TOC." into mnc-mr-docs am: 5d8d511264 am: 6049306d8c am: c25a9b0104

2016-05-02 19:39:03 +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%