Matthew Williams d08d6686c5 resolved conflicts for merge of 94b51810 to master ...

Change-Id: Ida818f066b66c356a84c80e5eab0a4e2cf4ebd49

2013-10-14 10:39:41 -07:00

api

am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev

2013-10-10 19:27:03 -07:00

cmds

am 65d57713: am bacb5422: Merge "Also rely on enabled notification listeners for RemoteController registration" into klp-dev

2013-10-07 10:10:08 -07:00

core

resolved conflicts for merge of 94b51810 to master

2013-10-14 10:39:41 -07:00

data

Add PowerManager method to assign blame to a single uid

2013-10-03 08:49:36 -07:00

docs

am d5786ca0: am 1001cf21: am eae969c1: am 439c4b47: am c0da3f1d: media-formats.html: clarify WebP availability

2013-10-11 12:50:17 -07:00

drm

Revert "Enhancement for OnInfo callback on DRM Framework"

2013-09-03 10:13:17 -07:00

graphics

Remove old hidden API.

2013-10-09 17:15:43 -07:00

include

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

keystore

Add argument to binder call to check key types

2013-09-05 13:27:00 -07:00

libs

move libandroidfw to frameworks/native

2013-10-03 10:30:18 -07:00

location

Improve some javadoc related to isProviderEnabled() apis

2013-09-11 11:03:03 -07:00

media

am 09872a35: am fb059f3c: am 7a6ccb87: Merge "Remote volume changes" into klp-dev

2013-10-11 14:21:10 -07:00

native

Move input library code to frameworks/native.

2013-07-01 20:11:42 -07:00

nfc-extras

Clean up dist files.

2013-05-21 12:38:22 -07:00

obex

Fixed review comments

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

opengl/java

Merge "Fix wrapper equals()"

2013-06-24 17:42:25 +00:00

packages

Merge "Import translations. DO NOT MERGE"

2013-10-14 16:22:55 +00:00

policy

am 09872a35: am fb059f3c: am 7a6ccb87: Merge "Remote volume changes" into klp-dev

2013-10-11 14:21:10 -07:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of 94b51810 to master

2013-10-14 10:39:41 -07:00

telephony/java

Telephony: SMS over IMS

2013-10-10 23:23:48 +00:00

test-runner

Add <intent-filter> support to <provider>.

2013-10-07 14:19:13 -07:00

tests

am 033837dd: Merge "Make fading transitions work better" into klp-dev

2013-09-30 14:13:27 -07:00

wifi/java/android/net/wifi

Fix WifiInfo#getHiddenSSID

2013-10-11 10:11:14 +00:00

Android.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

CleanSpec.mk

am 5c880d0d: am 6f688e87: am 8f34715b: Merge "Refactor how the print dialog activity is started." into klp-dev

2013-10-11 10:11:05 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Update preloaded-classes for KLP

2013-10-09 20:45:30 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%