Xia Wang 4bc5c4a1f5 resolved conflicts for merge of 16cbe575 to honeycomb-mr1 ...

Change-Id: Ic55f0bdeb5fc63bdabb4f4546fa7e1aa3201a6e0

2011-03-10 15:09:46 -08:00

api

Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1

2011-03-10 07:50:30 -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 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00

data

Recognize 3D joysticks. (DO NOT MERGE)

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

docs

am b56cb53f: Merge "DOC CHANGE: Add IntelliJ to Dev Guide" into honeycomb

2011-03-09 17:02:28 -08:00

drm

Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1

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

graphics

DO NOT MERGE: Fix typos in RenderScript docs.

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

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

Input improvements and bug fixes.

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

keystore

Update the path of the intent to unlock keystore.

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

libs

Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1

2011-03-10 07:50:30 -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

Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1

2011-03-09 15:47:10 -08:00

native

Joystick tweaks. (DO NOT MERGE)

2011-03-04 19:12:41 -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

Import revised translations. DO NOT MERGE

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

policy

Remove guard preventing onDetachedFromWindow() from being called

2011-03-07 11:07:26 -08:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1

2011-03-10 07:50:30 -08:00

telephony

DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

2011-03-03 09:53:52 -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 support for partial invalidates in WebView

2011-03-07 18:09:03 -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

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

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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%