Dianne Hackborn 398216dc9c Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: b3edcd78d2 ...

am: fc101121f2

* commit 'fc101121f23c292277cb8a54c35c07c4d98de67d':
  Fix issue #28400000: Settings memory UI still showing z-ram...

Change-Id: Ic0d46a17246d9882675c992b81d068be88cd5f74

2016-05-12 01:00:06 +00:00

api

Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad

2016-05-11 17:29:42 +00:00

cmds

Merge "Move the \'pretend idle jobs can run now\' broadcast into AMS" into nyc-dev

2016-05-06 21:42:47 +00:00

core

Merge "Fix issue #28400000: Settings memory UI still showing z-ram..." into nyc-dev am: b3edcd78d2

2016-05-12 01:00:06 +00:00

data

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

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

docs

Merge "Docs: Added new Whitelist feature to Data Saver for DP3" into mnc-io-docs am: ef189e9346

2016-05-12 00:33:30 +00:00

drm

…

graphics

Merge "Update and add attributes to the JavaDoc for VectorDrawable" into nyc-dev

2016-05-12 00:34:16 +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

Merge "Draw textShadow always first." into nyc-dev am: 45d6e79565

2016-05-11 22:11:44 +00:00

location

Fixed the sign error in GnssClock

2016-04-08 14:10:42 -07:00

media

Merge "TIF: Remove the uniqueness check for track ID from notifyTracksChanged" into nyc-dev

2016-05-12 00:38:13 +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 "Move spinner_dropdown_restricted_item to Settings." into nyc-dev am: f7a2afb4fc

2016-05-11 19:20:21 +00:00

proto

resolve merge conflicts of 8b3cb1b to nyc-mr1-dev

2016-05-11 11:35:46 -04:00

rs

Merge "[RenderScript] Interrupt mMessageThread when tearing down context." am: 9f2a1979a7

2016-05-11 19:32:00 +00:00

samples/training/network-usage

…

sax

…

services

Merge "Fix KeyguardManager.isSecure() to observe work profile" into nyc-dev am: 254d9e4f41

2016-05-12 00:59:00 +00:00

telecomm/java

Add removeExtras(String...) prototype per API review.

2016-05-10 14:52:33 -07:00

telephony/java

Merge "Add new carrier config option for video conference support." into nyc-mr1-dev

2016-05-11 01:23:26 +00:00

test-runner

Disallow disable of the system shared libs.

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

tests

Merge "Add WebView scroll activity to UiBench" into nyc-dev am: 597acb4d0b

2016-05-10 23:37:36 +00:00

tools

Merge "Fix VectorDrawable_Delegate and DrawerLayout" into nyc-dev am: 8fc7ca05e5

2016-05-11 16:01:35 +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%