Nick Pelly a64e2ad4da resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp ...

Change-Id: Iff9ea08b810b0d142a9227272492c0305a9bcf42

2011-03-14 10:28:11 -07:00

api

Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1

2011-03-11 18:01:47 -08:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

Merge "Switch to returnCode for IPackageDeleteObserver"

2011-03-02 08:50:42 -08:00

core

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -07:00

data

Recognize 3D joysticks. (DO NOT MERGE)

2011-03-09 18:30:28 -08:00

docs

am 9f187296: Merge "DOC CHANGE: Fix 4084450 monkeyrunner_concepts" into honeycomb

2011-03-11 13:10:29 -08:00

drm

- Some change on the DrmManager in order to support feature request 4082089.

2011-03-11 14:54:23 -08:00

graphics

DO NOT MERGE: Fix typos in RenderScript docs.

2011-03-03 16:10:52 -08:00

icu4j

…

include

Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1

2011-03-14 09:32:58 -07:00

keystore

Update the path of the intent to unlock keystore.

2011-01-20 20:23:59 +08:00

libs

USB: minor cleanup work

2011-03-11 18:51:29 -05:00

location

am ce57a7f3: am 6504490c: am dff6b8e7: Merge "Add --non-constant-id to aapt."

2011-02-28 10:10:38 -08:00

media

am 3ec9d06f: Merge "MtpDevice: Handle zero length packets in readResponse()" into honeycomb-mr1

2011-03-14 09:44:15 -07:00

native

Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1

2011-03-11 16:31:55 -08:00

nfc-extras

Implement new NFC-EE API's as shared library (frameworks/base).

2011-03-10 16:03:46 -08:00

obex

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

opengl

Fix EGL JNI bugs

2011-03-07 18:05:04 -08:00

packages

Add a dialog to ask user to start an application for a USB device or accessory

2011-03-13 19:18:08 -04:00

policy

Fix 3201849: Enable hardware acceleration in LockScreen WaveView [DO NOT MERGE]

2011-03-10 17:20:21 -08:00

sax

…

services

Add a dialog to ask user to start an application for a USB device or accessory

2011-03-13 19:18:08 -04:00

telephony

resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp

2011-03-11 14:05:14 -08:00

test-runner

am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase."

2011-02-28 11:05:55 -08:00

tests

Add a test app: quota exceeded doing a backup

2011-03-11 17:58:01 -08:00

tools

LayoutLib: fix Capabilities and getDimensionPixelSize

2011-03-08 15:00:35 -08:00

voip

NEW_API: Unhide RTP APIs.

2011-03-08 05:59:09 +08:00

vpn

Make VpnService synchronous API.

2011-01-20 12:51:43 +08:00

wifi/java/android/net/wifi

DO NOT MERGE update current config with dhcp settings

2011-03-03 15:00:51 -08:00

Android.mk

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -07:00

CleanSpec.mk

resolved conflicts for merge of 38d0d562 to honeycomb-plus-aosp

2011-03-14 10:28:11 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

resolved conflicts for merge of 00118a48 to honeycomb-merge

2011-01-27 18:25:32 -08:00

preloaded-classes

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%