Michael Wright 09ab7ef9f7 resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp ...

Change-Id: I4e3c1e1c5613284c60afc9ce6639624abe08df0d

2013-04-29 22:50:43 -07:00

api

Merge "Hide isLinkedUser()" into jb-mr2-dev

2013-04-26 01:42:20 +00:00

cmds

resolved conflicts for merge of b3f66877 to jb-mr2-dev-plus-aosp

2013-04-29 22:50:43 -07:00

core

am d152f7ec: Merge "Don\'t use X509CertImpl directly"

2013-04-29 14:16:09 -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

add docs for new attributes, including account restriction for restricted profiles

2013-04-25 19:05:55 -07:00

include

Rewrite input handling for native applications

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

keystore

Rename API AndroidKey* -> Key*

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

libs

Fix quickReject logic to account for setClipChildren() setting

2013-04-19 15:36:37 -07:00

location

GPS Hardware geofencing.

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

media

am 25619b2c: libdrm: fix bad strncpy / snprintf calls

2013-04-29 11:18:59 -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

am 027f84c3: Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev

2013-04-25 16:57:45 -07:00

policy

Lockscreen widgets not always announced.

2013-04-25 13:25:11 -07: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 9f844790: Merge "Remove scan notification dialog on wifi off" into jb-mr2-dev

2013-04-29 16:01:55 -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

Merge "Add input/output JSON data for baseline comparison" into jb-mr2-dev

2013-04-18 00:32:08 +00:00

tools

am bd1730de: Merge "Document the \'aapt dump strings\' command"

2013-04-29 15:19:24 -07:00

wifi/java/android/net/wifi

Fix network reload when config is restored

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

Android.mk

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

2013-04-26 12:04:07 -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%