Jose Lima 92703e62c1 resolved conflicts for merge of 4882ddfa to master ...

Change-Id: I179899697c148ac34a67b195e2dbd3df2f9138de

2014-03-13 21:26:48 -07:00

api

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

cmds

Add Lock Task Mode.

2014-03-13 11:09:13 -07:00

core

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

data

am ed28fc89: Utilize new Android LED constants. DO NOT MERGE

2014-03-11 23:16:25 +00:00

docs

am 41b60030: am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs

2014-03-12 15:19:19 +00:00

drm

Update DrmOutputStream to use raw FileDescriptor.

2014-02-06 09:47:38 -08:00

graphics

Force merge of remaining KLP changes to fix build.

2014-03-13 01:49:05 -07:00

include

resolved conflicts for merge of 92860a74 to master

2014-03-10 10:57:05 +00:00

keystore

KeyChain: add explicit package for getPrivateKey

2014-02-07 09:14:32 -08:00

libs

am f80f60ba: am d23d916e: Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev

2014-03-13 00:42:43 +00:00

location

Injected settings no longer include summaries

2014-03-03 10:30:36 -08:00

media

MTP: Add support for some audio specific object properties

2014-03-13 15:15:26 -07:00

native

Cleanup unnecessary includes for libskia.

2014-02-27 16:21:24 +00:00

nfc-extras

…

obex

Fixed review comments

2013-09-12 19:07:28 -07:00

opengl/java

Revert "Revert "Workaround apps not calling super.onDetachedFromWindow()""

2014-03-06 14:12:35 -08:00

packages

Merge "Import translations. DO NOT MERGE"

2014-03-13 16:22:45 +00:00

policy

am 70c27436: am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on"

2014-03-11 00:37:57 +00:00

rs

am edf0b79d: am 24ea88a9: am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."

2014-03-06 02:29:06 +00:00

samples/training/network-usage

…

sax

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

services

Merge "Add more information to existing notification_* events."

2014-03-13 21:26:35 +00:00

telephony/java

Add get/setPreferredNetworkType() for OMA DM client.

2014-03-03 13:27:20 -08:00

test-runner

resolved conflicts for merge of 4882ddfa to master

2014-03-13 21:26:48 -07:00

tests

Adds a TransportController and TransportPerformer to session

2014-03-12 15:09:42 -07:00

tools

resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp

2014-03-11 16:39:13 -07:00

wifi/java/android/net/wifi

Merge "Add new API to scan a given channel set"

2014-02-27 03:12:06 +00:00

Android.mk

Merge "Add removeApi commandline option for doclava and an empty removed.txt"

2014-03-13 22:11:41 +00:00

CleanSpec.mk

Move Session apis to android.media.session

2014-02-25 16:01:55 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Remove non-existent classes from preloaded-classes

2014-02-27 13:51:00 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%