Mike Lockwood 491f40ddf2 Fix merge problem ...

Signed-off-by: Mike Lockwood <lockwood@android.com>

2012-02-10 12:09:31 -08:00

api

Merge "Some cruft removal."

2012-02-10 11:14:39 -08:00

build

New dalvik heap config for xhdpi devices.

2011-09-15 17:52:04 -07:00

cmds

Add the ability to pass float extras to AM.

2012-02-10 12:03:53 -08:00

core

SystemServer: Add support for disabling AudioService and MountService

2012-02-10 12:02:04 -08:00

data

Adding a feature to indicate specific support for Bluetooth API.

2012-02-10 12:02:28 -08:00

docs

am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642

2012-02-09 16:06:31 -08:00

drm

Separate sniffing from session initialization

2012-01-12 16:25:12 -08:00

graphics

Tentative fix for mysteriously recycled bitmap

2012-02-08 11:19:11 -08:00

icu4j

…

include

Some hardening of isolated processes by restricting access to services.

2012-02-09 18:06:01 -08:00

keystore

…

libs

Merge "Some hardening of isolated processes by restricting access to services."

2012-02-09 18:08:38 -08:00

location

docs: Add developer guide cross-references, Project ACRE, round 4

2011-12-22 15:08:23 -08:00

media

VolumePanel: Add support for master volume

2012-02-10 09:05:49 -08:00

native

Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.

2012-01-25 15:14:50 -08:00

nfc-extras

Fix BasicNfcEeTest java package.

2011-12-09 14:35:32 -08:00

obex

…

opengl

fix a dead-lock in eglMakeCurrent

2012-02-03 15:24:51 -08:00

packages

SettingsProvider: Allow overridding default value for Setttings.Secure.DEVICE_PROVISIONED

2012-02-10 10:51:24 -08:00

policy

Fix problems dispatching media button events on headless devices

2012-02-10 10:51:24 -08:00

sax

…

services

Fix merge problem

2012-02-10 12:09:31 -08:00

telephony

Merge "Add ril.test.emergency system property."

2012-02-08 09:19:19 -08:00

test-runner

Rename CancellationSignal using preferred spelling.

2012-02-02 18:02:16 -08:00

tests

Quick and dirty test app for new SerialPort API

2012-02-10 10:51:20 -08:00

tools

Update aidl for new Broker API.

2012-02-10 10:51:23 -08:00

voip

am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"

2012-01-19 17:26:12 -08:00

wifi/java/android/net/wifi

am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"

2012-01-27 21:09:20 -08:00

Android.mk

Merge "New Serial Manager API:"

2012-02-10 11:41:41 -08:00

CleanSpec.mk

Rename CancellationSignal using preferred spelling.

2012-02-02 18:02:16 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

Update perf tests to always run each test in a fresh process.

2011-11-07 14:45:49 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%