Eric Laurent 281fd7a1c5 resolved conflicts for merge of f3a892ab to ics-aah ...

Change-Id: Id9c0ef089d4ed71dbf69c5969b36f9ac44a25ad3

2011-11-08 09:52:15 -08:00

api

Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"

2011-11-08 05:58:37 -08:00

build

New dalvik heap config for xhdpi devices.

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

cmds

DO NOT MERGE. Integrate: Include showmap output in bug report.

2011-11-04 13:38:18 -07:00

core

am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"

2011-11-08 14:02:58 +00:00

data

am f136aa34: Merge "Various performance and other work." into ics-mr1

2011-11-01 17:44:04 +00:00

docs

am 6c5951bf: Doc change: Updating device-admin with camera info.

2011-11-04 11:28:39 +00:00

drm

Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.

2011-09-21 21:50:31 -07:00

graphics

Some optimizations for view inflation.

2011-11-02 22:34:15 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.

2011-11-05 02:38:33 +00:00

keystore

Make the KeyChain handled its own grants rather than having

2011-07-13 22:45:07 -07:00

libs

am 88061d6b: am 5462bc63: Fix a leak in Parcel::writeBlob.

2011-11-05 02:38:33 +00:00

location

Acknowledge that the platform guarantees UTF-8 and UTF-16.

2011-07-19 12:10:07 -07:00

media

am 713c9a33: Merge "Fix 5509346: Resize the thumbnails if it\'s too large." into ics-mr1

2011-11-08 07:02:13 +00:00

native

fix the float Rect in OpenGLRenderer to handle NANs

2011-09-19 16:50:07 -07:00

nfc-extras

Preserve invariant that sService is not null (although NfcAdapter.get() can return null)

2011-07-09 23:57:22 -07:00

obex

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

2011-05-20 10:51:25 -07:00

opengl

EGL: Add stubs for EGL_ANDROID_blob_cache

2011-11-04 15:01:51 -07:00

packages

am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1

2011-11-08 03:48:55 +00:00

policy

am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1

2011-11-07 22:26:56 +00:00

sax

…

services

resolved conflicts for merge of f3a892ab to ics-aah

2011-11-08 09:52:15 -08:00

telephony

Remain in call audio mode while phone is offhook.

2011-11-07 15:45:18 -08:00

test-runner

Fix ownership of CursorWindows across processes.

2011-10-09 22:10:36 -07:00

tests

am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1

2011-11-08 02:49:25 +00:00

tools

Support putting Flattenables in Lists.

2011-11-07 18:12:22 -08:00

voip

SipService: handle connectivity changes correctly.

2011-09-30 16:46:30 -07:00

wifi/java/android/net/wifi

Merge "Avoid quick shutdown after a driver start" into ics-mr1

2011-11-04 11:47:27 -07:00

Android.mk

am 62015f5d: am aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0

2011-10-31 20:32:43 +00:00

CleanSpec.mk

Resolved conflicts for merge of 83cf0313 to master

2011-10-10 16:46:35 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -08:00

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%