Craig Mautner f32b22e9c7 resolved conflicts for merge of ca903d38 to klp-modular-dev ...

Change-Id: I44b8cbeb9ae9f6e5c8b2fe1363127d6eccfdf041

2014-03-25 11:05:08 -07:00

api

Merge "Unhide Notification kind, rename to category." into klp-modular-dev

2014-03-24 17:38:44 +00:00

cmds

Extend stack management to other displays.

2014-01-06 08:51:21 -08:00

core

am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

2014-03-25 03:46:17 +00:00

data

Utilize new Android LED constants. DO NOT MERGE

2014-03-11 14:52:18 -07:00

docs

am 27fa561f: am 52f449fd: fix size and behavior of video thumbnail when flash not available

2014-03-25 10:11:55 +00:00

drm

AArch64: Use long for pointers in DRM classes

2014-01-17 14:38:25 +00:00

graphics

am fc603ca6: am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev

2014-03-21 19:47:22 +00:00

include

AssetManager cookies should be int32_t and not void*.

2014-01-27 11:20:24 +00:00

keystore

…

libs

Merge "Add idc config option for handling key repeats" into klp-modular-dev

2014-03-20 01:55:16 +00:00

location

…

media

am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev

2014-03-19 20:52:03 +00:00

native

…

nfc-extras

…

obex

…

opengl/java

…

packages

am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping

2014-03-25 03:46:27 +00:00

policy

am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge

2014-03-14 21:54:52 +00:00

samples/training/network-usage

…

sax

…

services

resolved conflicts for merge of ca903d38 to klp-modular-dev

2014-03-25 11:05:08 -07:00

telephony/java

am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

2014-03-25 03:46:17 +00:00

test-runner

Add banner attribute to app manifest

2014-03-12 18:07:38 -07:00

tests

resolved conflicts for merge of c45ff35f to klp-modular-dev

2014-03-05 12:28:04 -08:00

tools

Merge "Dump leanback info in aapt dump badging." into klp-modular-dev

2014-03-08 00:55:48 +00:00

wifi/java/android/net/wifi

am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

2014-03-21 00:45:42 +00:00

Android.mk

am e05077d7: am 83da75d9: Added a private apis jar that includes explicitly supported APIs that are not useful for 3rd party developers.

2014-03-25 03:46:17 +00:00

CleanSpec.mk

Move some system services to separate directories

2013-12-19 15:25:37 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%