Julia Reynolds b00889ddc2 resolved conflicts for merge of b259603d to master ...

Change-Id: Ia74bb64ce5946a86ecf05b8c4e258dd2ac68ba04

2014-08-20 22:42:08 -04:00

api

am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

2014-08-21 00:57:08 +00:00

cmds

Add Shell command to set AppOps permissions

2014-08-19 11:27:19 -07:00

core

resolved conflicts for merge of b259603d to master

2014-08-20 22:42:08 -04:00

data

Merge "Compress miscellaneous fonts." into lmp-dev

2014-08-20 01:43:56 +00:00

docs

am eb60d0f1: am 94174ff7: am 8319455a: Merge "docs: Documented new fields returned by getSkuDetails()." into klp-modular-docs

2014-08-19 05:52:57 +00:00

drm

…

graphics

Make getOutline account for gravity BitmapDrawable

2014-08-19 17:44:20 -07:00

include

Merge "AAPT support for feature splits" into lmp-dev

2014-08-09 00:40:15 +00:00

keystore

am bcdd58c5: am e21dd346: am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev

2014-08-15 14:44:23 +00:00

libs

am 5895f085: am 5bdd7e48: Merge "Early reject drawText calls that will not draw" into lmp-dev

2014-08-19 23:43:55 +00:00

location

Added notification color to all system notifications

2014-08-20 14:25:18 +02:00

media

am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

2014-08-21 00:57:08 +00:00

native

Sensor related changes for NDK.

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

nfc-extras

…

obex

…

opengl/java

…

packages

am dae3e104: am 1654a6c7: am 4ff1c9a2: Merge "Don\'t close panel when in QS and all notifications go away" into lmp-dev

2014-08-21 00:57:34 +00:00

phone/java/android/phone

Some string cleanup.

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

policy

Remove logspam from GlobalActions.

2014-08-20 10:36:33 -04:00

rs

am c9c78206: am 9ba9298e: Merge "Stop sign-extending RS IDs." into lmp-dev

2014-08-19 21:07:47 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of b259603d to master

2014-08-20 22:42:08 -04:00

telecomm/java

Made all classes required for an InCallService @SystemApi

2014-08-20 16:08:53 +00:00

telephony/java

Merge "Add public qualifier to TelephonyManager.TeleiccExchangeSimIO." into lmp-dev

2014-08-19 02:43:23 +00:00

test-runner

Add hidden API for removing cross-profile package filters

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

tests

Remove incomplete media router API. (DO NOT MERGE)

2014-08-19 20:08:52 -07:00

tools

am 015f660a: am 0c64e11d: am 93294c92: Merge "Fix "@null" resource values in LayoutLib." into lmp-dev

2014-08-20 00:39:27 +00:00

wifi/java/android/net/wifi

am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

2014-08-20 19:26:13 +00:00

Android.mk

Remove incomplete media router API. (DO NOT MERGE)

2014-08-19 20:08:52 -07:00

CleanSpec.mk

Remove system_server classes from the boot image.

2014-08-15 13:37:03 +01:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove WebView library preloading mechanism.

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

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%