Elliott Hughes 9f22aef0c9 resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp ...

Change-Id: I79418b166b9efbc2ca028a05ec04e5a7fd667ee6

2014-10-03 15:29:32 -07:00

api

Update api/current.txt

2014-10-02 10:13:30 -07:00

cmds

am 8292b033: am a266670a: am d7275ae2: am 75c33d9d: Merge "Adds the ability to start a user in background" into lmp-dev

2014-10-01 17:09:34 +00:00

core

am e2776f02: am 6b1cf642: am 5ebb0e6a: am d867b7c7: Fix issue #17783882: AUPT: NPE in Videos: Attempt to invoke virtual method...

2014-10-03 21:52:23 +00:00

data

[FM] Add FM permission to support FM radio app

2014-10-01 18:39:16 -07:00

docs

am ba435fc2: am d019b19e: am 677dd506: am 1e2e4307: am 1242af06: am 32cfe2bb: am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs

2014-10-03 18:33:52 +00:00

drm

…

graphics

am c03d6f89: am 855e63e9: am 29345d8d: am 9f64867d: Merge "Fix theme propagation to contained android:drawable elements" into lmp-dev

2014-10-02 23:38:12 +00:00

include

am 9ee3ba23: am e7e9ad6d: am 863b1a90: am 19f9d54f: Merge "Fix backwards compat problem with AAPT public attrs" into lmp-dev

2014-09-19 19:08:50 +00:00

keystore

…

libs

am ab8f73a7: am 497cb6c0: Merge "Avoid creating Caches instance with gfxinfo dump" into lmp-mr1-dev

2014-10-02 20:12:59 +00:00

location

am df9e62f0: am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

2014-09-26 04:29:47 +00:00

media

am 26c2e5a0: am 49c14438: am 2d553e95: am 7a60cdbd: Merge "Fix regression in RCC.editMetadata(false)" into lmp-dev

2014-10-03 21:52:37 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

Re-allow suppressing onDetachedFromWindow

2014-10-01 10:38:07 -07:00

packages

resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp

2014-10-03 15:29:32 -07:00

policy

am fbeaa769: am 9098184b: am 35eb8909: am ba5df0d0: Merge "Prevent monkey from triggering bugreport" into lmp-dev

2014-10-03 21:52:28 +00:00

rs

…

samples/training/network-usage

…

sax

…

services

am e53a3188: am 9ae2bca4: am 31deb67d: am 76716c5a: Revert "TouchExplorer computes incorrectly the click location."

2014-10-03 21:52:51 +00:00

telecomm/java

am 25b85bcc: am 8f8bffa1: Merge "Add @SystemApi to missing TelecomManager methods" into lmp-dev

2014-10-02 23:22:57 +00:00

telephony/java

am 3b73c5c3: am 53fbb02d: am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

2014-10-02 22:01:39 +00:00

test-runner

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

tests

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

tools

am 09714a76: am 82e28181: am c62da8a0: am c74a2b34: Merge "Minor style changes." into lmp-dev

2014-10-03 21:52:46 +00:00

wifi/java/android/net/wifi

am 6245bd9e: am eef8d3eb: am df959707: am 7fe95529: Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev

2014-10-02 13:40:24 +00:00

Android.mk

…

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Revert "Revert "Frameworks/base: Update to preloaded-classes""

2014-10-02 19:05: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%