Brian Colonna 1ae5b71a95 resolved conflicts for merge of 7cf1eeb9 to master ...

Change-Id: Id125e315e24ced927f3a500135af7e5aff50cfa2

2011-11-09 16:13:51 -05:00

api

am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1

2011-11-09 14:34:18 +00:00

build

New dalvik heap config for xhdpi devices.

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

cmds

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00

core

am 604019c8: Merge "Fix build." into ics-mr1

2011-11-09 19:34:50 +00:00

data

Merge "Merge: Correctly updating Roboto HHEA table to master Bug: 5516773"

2011-11-07 14:33:35 -08:00

docs

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

2011-11-04 11:34:16 +00:00

drm

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

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

graphics

am e0ad4746: Merge "Some optimizations for view inflation." into ics-mr1

2011-11-03 22:19:36 +00:00

icu4j

…

include

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

Fix possible leak in Parcel::writeDupFileDescriptor.

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

location

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

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

media

resolved conflicts for merge of 26f70db9 to master

2011-11-08 10:40:20 -08:00

native

NDK: ANativeActivity: Fix documentation for 'clazz' member.

2011-11-08 14:18:11 +01: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

Merge "Properly passing an unused variable through."

2011-11-07 09:53:28 -08:00

packages

resolved conflicts for merge of ea54b760 to master

2011-11-09 09:03:59 -08:00

policy

resolved conflicts for merge of 7cf1eeb9 to master

2011-11-09 16:13:51 -05:00

sax

…

services

am 604019c8: Merge "Fix build." into ics-mr1

2011-11-09 19:34:50 +00:00

telephony

Merge "Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid."

2011-11-09 02:13:41 -08:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

Add another test for WebView's Java Bridge

2011-11-09 16:22:13 +00: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 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1

2011-11-05 19:33:16 +00:00

Android.mk

Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0

2011-10-31 13:28:57 -07: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%