Alex Light a25dc2bbe7 resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp ...

Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)

2014-08-06 22:25:00 -07:00

api

Surface user action events when un/installing.

2014-08-07 00:23:54 +00:00

cmds

Surface user action events when un/installing.

2014-08-07 00:23:54 +00:00

core

Fix cross-user talk.

2014-08-07 05:14:36 +00:00

data

Fix GSUB ccmp rule to use non-spacing marks.

2014-08-01 13:25:27 -07:00

docs

am c08203c2: am 4881578e: am ea12f0fd: Fix some sync adapter docs typos.

2014-08-04 21:26:44 +00:00

drm

am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev

2014-06-10 01:30:05 +00:00

graphics

Fix nine patch crash

2014-08-06 16:44:47 +00:00

include

Merge "Add kModeSync" into lmp-dev

2014-07-24 20:48:02 +00:00

keystore

Merge "Revert "Revert "Publish DevicePolicyManager CA certificate APIs"""

2014-06-17 21:55:55 +00:00

libs

clamp & round alpha

2014-08-06 10:19:32 -07:00

location

Expose Gps Navigation Messages in the platform.

2014-07-23 10:30:21 -07:00

media

Rename HdmiCecDeviceInfo into HdmiDeviceInfo.

2014-08-07 11:14:15 +09:00

native

Sensor related changes for NDK.

2014-08-05 19:34:04 -07:00

nfc-extras

…

obex

Bluetooth: Support MAP Client role on Bluedroid.

2014-07-01 18:01:27 +00:00

opengl/java

Fix onTrimMemory for HardwareRenderer

2014-06-30 16:36:26 -07:00

packages

Common shade width across devices.

2014-08-06 23:33:53 -04:00

phone/java/android/phone

Some string cleanup.

2014-07-10 19:20:29 +00:00

policy

Don't dismiss boot messages before keyguard is ready

2014-08-05 23:04:42 +00:00

rs

Fix broken blend intrinsic.

2014-07-10 13:00:10 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp

2014-08-06 22:25:00 -07:00

telecomm/java

Add setConferenceable() API from ConnectionService to incall. (1/4)

2014-08-06 03:36:09 -07:00

telephony/java

Return APDU status code on tramsit channel command failure.

2014-08-05 17:06:51 -07:00

test-runner

Add hidden API for removing cross-profile package filters

2014-08-06 14:52:50 +00:00

tests

Add stroke related test to the VectorDrawableTest

2014-08-06 18:07:16 +00:00

tools

Merge "Modify base Configuration used for aapt dump badging" into lmp-dev

2014-08-06 21:46:55 +00:00

wifi/java/android/net/wifi

record join attempts

2014-07-29 12:33:12 -07:00

Android.mk

Surface user action events when un/installing.

2014-08-07 00:23:54 +00:00

CleanSpec.mk

CleanSpec!

2014-08-06 09:28:58 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove WebView library preloading mechanism.

2014-07-17 09:18:43 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%