Svetoslav 605775c4ed resolved conflicts for merge of ba35cf7a to master ...

Change-Id: Id9e6fa12056fc6cef7b77c70c73591dfc82e70a9

2013-08-20 18:18:14 -07:00

api

am 1e698982: am a37e2346: Merge "Warn that SettingInjectorService must be fast" into klp-dev

2013-08-20 17:51:49 -07:00

cmds

Changes needed to support Skia at r10377.

2013-08-01 12:52:21 -04:00

core

Revert "Added the callback signal."

2013-08-21 00:16:57 +00:00

data

Add GIDs to packages.list, update SD card perms.

2013-08-12 20:31:36 -07:00

docs

am 1b3f1533: am 414905b7: update samples nav for new script

2013-08-20 17:20:39 -07:00

drm

…

graphics

am 948e200e: am 9fac8a6a: Merge "Renderscript: Allow YUV_420_888 as a YUV type." into klp-dev

2013-08-20 17:40:07 -07:00

include

Clearly separate consumer and producer interfaces

2013-08-06 13:07:42 -07:00

keystore

Add methods for managing CAs to DevicePolicyManager(Service)

2013-08-20 14:30:36 -04:00

libs

am 816f3058: am cf8e6778: Merge "Handle updates to C++ API." into klp-dev

2013-08-20 11:34:04 -07:00

location

Warn that SettingInjectorService must be fast

2013-08-19 13:13:21 -07:00

media

Merge "MediaPlayer: add listener for subtitle data" into klp-dev

2013-08-20 18:25:05 +00:00

native

Move input library code to frameworks/native.

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

nfc-extras

…

obex

Bluetooth MAP profile - sms and mms support initial check-in

2013-08-09 15:01:07 -07:00

opengl/java

Merge "Fix wrapper equals()"

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

packages

am a9e12e03: am ff796e5a: Merge "Change PacProcessor to Android Service" into klp-dev

2013-08-20 16:39:32 -07:00

policy

Maintain TRANSIENT_*_BAR flags until transient bars hidden.

2013-08-15 17:16:28 -04:00

samples/training/network-usage

…

sax

…

services

Merge "Change PacProcessor to Android Service" into klp-dev

2013-08-20 23:35:26 +00:00

telephony/java

Add network type TYPE_MOBILE_IA.

2013-07-29 15:02:29 -07:00

test-runner

Catch a few extra users of UserEnvironment.

2013-08-11 17:42:17 -07:00

tests

Make color filters mutable

2013-08-19 18:18:00 -07:00

tools

Fixes for libpng 1.6

2013-08-14 14:15:06 -07:00

wifi/java/android/net/wifi

Merge "Expose WifiManager.setTdlsEnabled public API" into klp-dev

2013-08-19 19:14:03 +00:00

Android.mk

am a9e12e03: am ff796e5a: Merge "Change PacProcessor to Android Service" into klp-dev

2013-08-20 16:39:32 -07:00

CleanSpec.mk

resolved conflicts for merge of ba35cf7a to master

2013-08-20 18:18:14 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

am c40e46e8: am bfe1b801: Merge "Update preloaded-classes"

2013-07-30 14:10: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%