Gloria Wang 09ba5cebb2 resolved conflicts for merge of c761a80d to master ...

Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c

2011-03-14 11:56:39 -07:00

api

am ce3bcbad: am 9ff64838: Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1

2011-03-11 23:10:55 -08:00

build

…

cmds

Merge "Switch to returnCode for IPackageDeleteObserver"

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

core

Merge "Throw errors on failures to set system properties."

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

data

am f0210c36: Merge "Joystick tweaks. (DO NOT MERGE)" into honeycomb-mr1

2011-03-07 11:49:52 -08:00

docs

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

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

drm

resolved conflicts for merge of c761a80d to master

2011-03-14 11:56:39 -07:00

graphics

DO NOT MERGE: Fix typos in RenderScript docs.

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

icu4j

…

include

resolved conflicts for merge of c761a80d to master

2011-03-14 11:56:39 -07:00

keystore

…

libs

am 3b473d95: am 9fffd9a8: Merge "USB: minor cleanup work" into honeycomb-mr1

2011-03-11 23:10:41 -08: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 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1

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

native

Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1

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

obex

…

opengl

GLES2Debugger: Added DbgContext and vertex data capturing.

2011-03-10 16:40:37 -08:00

packages

am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1

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

policy

Fix 3201849: Enable hardware acceleration in LockScreen WaveView

2011-03-09 19:47:56 -08:00

sax

…

services

am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1

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

telephony

am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-03-11 15:17:44 -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

…

wifi/java/android/net/wifi

update current config with dhcp settings

2011-03-03 12:14:28 -08:00

Android.mk

Move USB framework support from android.hardware to android.hardware.usb package

2011-03-01 08:07:20 -08:00

CleanSpec.mk

Move USB framework support from android.hardware to android.hardware.usb package

2011-03-01 08:07:20 -08:00

GenerationCache.h

Add TextLayout Cache

2011-03-02 13:29:20 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%