Jim Miller 76b2337cfa resolved conflicts for merge of 1a783be3 to master ...

Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54

2011-11-18 13:56:20 -08:00

api

am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1

2011-11-18 02:37:22 -08:00

build

New dalvik heap config for xhdpi devices.

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

cmds

am 2084d206: am 0f3570c3: Merge "Re-enable vril-dump for adb bugreport." into ics-mr1

2011-11-17 15:56:25 -08:00

core

am a4f5c425: am 2b9af44e: am 6da97a24: Merge "Check the bluetooth state for getUuid call" into ics-mr0

2011-11-17 15:13:03 -08:00

data

Whoops, need to acquire lock.

2011-11-15 16:12:30 -08:00

docs

Remove untrue tip about zero-length arrays.

2011-11-18 15:02:15 -05:00

drm

Fix log message

2011-11-10 14:58:44 -08:00

graphics

am a962ef29: am 4c593010: Merge "Followup to a bug fix. Addtion of synchronized to the methods triggers an API change. Per council advice, pushing synch block into the function body." into ics-mr1

2011-11-17 04:08:30 -08:00

icu4j

…

include

Merge "JetPlayer uses C++ Thread not createThreadEtc"

2011-11-17 07:14:29 -08:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

am 9da22d2c: am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1

2011-11-18 02:37:41 -08:00

location

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

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

media

am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1

2011-11-17 13:20:16 -08:00

native

Merge "Remove obsolete NativeWindow_fromSurfaceTexture"

2011-11-15 15:25:38 -08:00

nfc-extras

Move nfc-extras tests into frameworks/base/nfc-extras/tests.

2011-11-14 15:28:47 -08:00

obex

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

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

opengl

am e2fca63a: am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1

2011-11-18 02:37:39 -08:00

packages

am 664bb774: am aefc0ed9: Merge "Don\'t upgrade some settings from GB to ICS." into ics-mr1

2011-11-17 13:20:22 -08:00

policy

resolved conflicts for merge of 1a783be3 to master

2011-11-18 13:56:20 -08:00

sax

…

services

am 852b589a: am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1

2011-11-18 09:15:54 -08:00

telephony

am 7d22534b: am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1

2011-11-18 02:37:28 -08:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

am 1753fd00: am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1

2011-11-18 09:15:56 -08:00

tools

Set theme-tag in render log when failing to find style

2011-11-01 11:51:20 -07:00

voip

Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

2011-10-26 09:57:54 +01:00

wifi/java/android/net/wifi

am 1c9126c6: am 59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1

2011-11-09 21:51:12 +00:00

Android.mk

Adding missed Android.mk file to the original Bluetooth HDP sample Change-Id: I7035cb13da6f6cd64e63df8a5ccf2391fe41f18e.

2011-11-16 15:28:35 -08:00

CleanSpec.mk

Resolved conflicts for merge of 83cf0313 to master

2011-10-10 16:46:35 -07: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%