Adam Hampson 668b1bf80b resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp ...

Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f

2014-04-08 10:24:47 -07:00

api

am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

2014-04-05 09:05:50 +00:00

cmds

am f87b3a25: am 374db6c3: Merge "Remove ProcessState::mArgc,mArgV,mArgLen"

2014-04-03 14:11:34 +00:00

core

am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

2014-04-05 09:05:50 +00:00

data

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

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

docs

am 17878a9a: am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs

2014-04-05 22:38:52 +00:00

drm

AArch64: Use long for pointers in DRM classes

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

graphics

am ecaea7e6: Merge "Force refresh of stateful when a child drawable is changed." into klp-modular-dev

2014-03-31 19:08:24 +00:00

include

am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

2014-04-04 19:28:09 +00:00

keystore

Add argument to binder call to check key types

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

libs

am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

2014-04-04 19:28:09 +00:00

location

Improve some javadoc related to isProviderEnabled() apis

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

media

am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev

2014-04-03 01:35:28 +00:00

native

am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor"

2014-04-05 09:05:50 +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

AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY

2014-02-26 19:07:54 +00:00

packages

am 6a14146b: am e328056d: Merge "Add support for additional international keyboard mappings"

2014-03-28 23:05:36 +00:00

policy

am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev

2014-04-01 21:56:55 +00:00

rs

am b3cafa56: Merge "Fix RenderScriptGL setSurfaceTexture problem"

2014-04-01 00:10:55 +00:00

samples/training/network-usage

cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2

2012-08-08 11:27:09 -07:00

sax

…

services

am 228cefa8: am 3fb2b713: Merge "[ActivityManager] Reduce report ANR on wrong activity."

2014-04-07 22:21:33 +00:00

telephony/java

am aee03bb1: am 49c06150: Merge "Remove duplicate call disconnect codes."

2014-03-28 17:31:33 +00:00

test-runner

Add banner attribute to app manifest

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

tests

am 05d855de: am d93e7b24: Merge "Don\'t attempt to launch disabled activities in smoke test."

2014-03-16 17:31:18 +00:00

tools

am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into klp-modular-dev

2014-04-04 19:28:09 +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

Original DnsSd TxtRecord file

2012-04-04 11:37:35 -07:00

preloaded-classes

Remove DRLCertFactory

2014-01-31 14:10:15 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%