Narayan Kamath 3a951e52d9 resolved conflicts for merge of 69da8a12 to klp-modular-dev-plus-aosp ...

Change-Id: Ie07b88f324749afcf8417b50d4dbbc6e2a271a2a

2014-05-01 15:32:20 +01:00

api

am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev

2014-04-24 16:33:02 +00:00

cmds

am c8a045d4: am 41f40581: Merge "Fix x86 build in app_process."

2014-05-01 10:43:23 +00:00

core

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

2014-05-01 15:32:20 +01:00

data

am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev

2014-03-25 21:13:53 +00:00

docs

am b76f7b35: am 8873025b: am f26a7100: Merge "update wear stack notifications to coincide with devbyte code" into klp-docs

2014-05-01 09:42:08 +00:00

drm

AArch64: Use long for pointers in DRM classes

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

graphics

am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev

2014-04-16 23:54:22 +00:00

include

am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime args."

2014-04-09 14:02:08 +00:00

keystore

Add argument to binder call to check key types

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

libs

am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"

2014-04-30 01:19:52 +00:00

location

Improve some javadoc related to isProviderEnabled() apis

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

media

am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"

2014-04-30 15:37:58 +00:00

native

am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

2014-04-11 19:34:51 +00: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

EGL_OPENGL_ES3_BIT_KHR is set as ES 3 context is requested.

2014-04-15 05:11:58 +08:00

packages

am 263c36a1: am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"

2014-04-30 01:24:32 +00:00

policy

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

rs

am a4898534: Merge "Fix improper use of JNI_ABORT for operations where Java objects are written."

2014-04-17 18:20:47 +00:00

samples/training/network-usage

…

sax

…

services

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

2014-05-01 15:32:20 +01:00

telephony/java

Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD

2014-04-29 16:07:29 -07:00

test-runner

Added getLeanbackLaunchIntentForPackage()

2014-04-11 10:54:39 -07:00

tests

am 62538940: Merge "Add support for custom TXT records in NSD" into klp-modular-dev

2014-04-14 21:16:27 +00:00

tools

am 6a6979ad: am 86315c45: Merge "Fixes issue causing pseudolocalization of strings in non-translatable resource files."

2014-04-30 21:35:45 +00:00

wifi/java/android/net/wifi

am 72358802: am 45e74676: Merge "Don\'t reset country code once it is persisted" into klp-dev

2014-04-17 21:57:12 +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

Removed android.debug.JNITest from preloaded-classes

2014-03-24 20:21:04 +00:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%