David Christie 4f1d1fc92d resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619 am: 3aaac55e70 am: a6de8f20c7 ...

am: 00e1e39ae2

Change-Id: I23587e80ea85f66e872e8bf0a9b1f83399c3b6fc

2016-08-25 01:25:30 +00:00

api

DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf

2016-07-07 01:13:47 +00:00

cmds

Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am: d327d73edf

2016-07-12 19:20:38 +00:00

core

DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support

2016-08-22 11:40:03 -07:00

data

Move DownloadsManager to permanent whitelist.

2016-05-31 17:50:39 -07:00

docs

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev

2016-08-23 15:42:03 +00:00

drm

…

graphics

Avoid potential re-entry as a result of child mutation

2016-08-22 20:00:30 +00:00

include

Performance improvements in AssetManager

2016-05-20 15:04:09 -07:00

keystore

Fix @link tags in keystore doc

2016-08-02 16:45:06 +00:00

libs

Avoid throwing when 0 size layer requested

2016-07-11 12:20:52 -07:00

location

Docs: Suppress errors in SystemApi Build

2016-06-01 16:13:53 -07:00

media

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522

2016-07-29 19:02:43 +00:00

native

Sensor: Add batch support for native applications

2016-03-16 18:07:00 -07:00

nfc-extras

…

obex

…

opengl/java

Make surfaceRedrawNeeded forgiving

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

packages

Added error handling to settings suggestions list

2016-08-24 16:43:22 +00:00

proto

add metrics for gestural notification expansions

2016-05-26 17:20:33 -04:00

rs

Delete simple reduction implementation.

2016-06-02 14:47:12 -07:00

samples/training/network-usage

…

sax

…

services

resolve merge conflicts of 8aaffd9 to nyc-dev

2016-08-24 16:45:01 -07:00

telecomm/java

Handle Concurrency issues in Connection

2016-06-15 20:53:25 +00:00

telephony/java

Add a key for setting carrier's CDMA roaming mode

2016-06-13 13:31:06 -07:00

test-runner

ContextImpl: Keep DisplayAdjustments and Display in sync

2016-06-21 17:55:58 -07:00

tests

Merge "App launch - Test app changes" into nyc-dev

2016-07-12 16:02:43 +00:00

tools

Add bound checks to utf16_to_utf8 am: bce11021b2 am: 008120497b

2016-07-14 18:23:54 +00:00

wifi/java/android/net/wifi

Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994

2016-07-20 01:19:46 +00:00

Android.mk

dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.

2016-08-16 16:28:20 -07:00

CleanSpec.mk

…

compiled-classes-phone

Frameworks/base: Update compiled-classes-phone

2016-06-07 03:12:03 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Frameworks/base: Update preloaded-classes

2016-06-06 14:58:44 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%