Jim Miller a3b5bae9cf Fix the build. ...

This fixes a bad merge in LockSettingsService.

Change-Id: I941bae77446dd0e94f409f0d64330ca5391f8efa

2013-04-23 18:34:46 -07:00

api

Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-dev

2013-04-23 22:47:52 +00:00

cmds

Disable tracing from Zygote

2013-04-16 22:15:21 +00:00

core

Merge "Fixing bugs exposed when moving accessibility CTS tests to UiAutomation." into jb-mr2-dev

2013-04-24 01:05:38 +00:00

data

Fix keylayouts to use BACK instead of incorrect BUTTON_BACK.

2013-04-23 15:54:21 -07:00

docs

am 2dd874ac: am e0445881: am 51a452a9: am 4af72165: am 7653fbee: make Google IO image clickable

2013-04-23 12:41:40 -07:00

drm

Add liblog

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

graphics

Merge "Add new error code for Debug Context work." into jb-mr2-dev

2013-04-20 04:48:18 +00: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

Merge "Identify in logs launch of voice search from key events" into jb-mr2-dev

2013-04-23 01:30:30 +00: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

Add NOTICE and MODULE_LICENSE_BSD_LIKE for obex

2012-04-06 14:04:31 -07:00

opengl/java

Revert all recent GLSurfaceView changes.

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

packages

Listen for brightness dialog broadcasts from all users

2013-04-22 09:27:08 -07:00

policy

Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)" into jb-mr2-dev

2013-04-19 20:26:02 +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

Fix the build.

2013-04-23 18:34:46 -07:00

telephony/java

Add CellInfoWcdma and related classes.

2013-04-17 16:40:17 -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

Revert "Make --non-constant-id generates non final IDs for styleable."

2013-04-13 09:48:01 -07:00

wifi/java/android/net/wifi

Merge "Fix NPE issues seen by CTS" into jb-mr2-dev

2013-04-19 19:43:46 +00:00

Android.mk

Add ContentValues & CursorWindow to framework.aidl

2013-04-23 08:30:34 +10:00

CleanSpec.mk

New NotificationListenerService.

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

MODULE_LICENSE_APACHE2

…

NOTICE

Original DnsSd TxtRecord file

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

preloaded-classes

update preloaded-classes

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

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%