Kenny Root 590bca3b24 resolved conflicts for merge of 09ab7ef9 to master ...

Change-Id: I505317d0cde7a6daf0fd50b20cba21aa55693263

2013-04-30 09:00:14 -07:00

api

Remove obsolete OMA-DRM support

2013-04-29 16:48:13 -07:00

cmds

Add longpress support to keyevent.

2013-04-29 15:31:10 -07:00

core

am 460778f1: am 906e57d8: Merge "Fixed race conditions in GeofenceHardwareImpl." into jb-mr2-dev

2013-04-30 08:31:46 -07:00

data

Add DPad keys to Playpad

2013-04-26 15:06:38 -07:00

docs

am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev

2013-04-25 21:22:38 -07:00

drm

Add liblog

2013-04-09 21:54:12 -07:00

graphics

am 01e48e7d: am 22f6a60e: Merge "add docs for new attributes, including account restriction for restricted profiles" into jb-mr2-dev

2013-04-25 21:27:06 -07:00

include

Allow compiling aapt for the device

2013-04-26 15:07:09 +01:00

keystore

Rename API AndroidKey* -> Key*

2013-04-18 18:34:58 -07:00

libs

Allow compiling aapt for the device

2013-04-26 15:07:09 +01:00

location

GPS Hardware geofencing.

2013-04-10 15:25:07 -07:00

media

Fix javadoc errors for @deprecated tags with no explanatory comment

2013-04-29 18:21:25 -07:00

native

Rewrite input handling for native applications

2013-04-22 17:01:51 -07:00

nfc-extras

Add exception types for NfcEe operations.

2013-02-12 13:43:30 -08:00

obex

…

opengl/java

Revert all recent GLSurfaceView changes.

2013-04-19 17:19:53 -07:00

packages

Import translations. DO NOT MERGE

2013-04-29 22:48:39 -07:00

policy

Merge "Hideybar gesture clears flags if SYSTEM_UI_FLAG_FULLSCREEN"

2013-04-29 12:52:26 +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 fd0b0072: am 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev

2013-04-30 08:54:22 -07:00

telephony/java

Enhance TelephonyManger javadocs.

2013-04-25 15:02:34 -07:00

test-runner

New ContentProvider initialization for testing.

2013-02-26 16:16:14 -08:00

tests

Fix build due to transition test errors

2013-04-18 14:18:35 -07:00

tools

Merge commit 'b3f66877' into afdmerge

2013-04-29 15:29:13 -07:00

wifi/java/android/net/wifi

Fix network reload when config is restored

2013-04-25 23:27:19 -07:00

Android.mk

am eb6403e9: resolved conflicts for merge of bfdd2566 to jb-mr2-dev-plus-aosp

2013-04-26 12:06:15 -07:00

CleanSpec.mk

New NotificationListenerService.

2013-04-05 19:54:44 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Update preloaded classes

2013-04-26 13:38:07 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%