Jason Simmons 3b282fae37 resolved conflicts for merge of 0c0120ef to ics-aah ...

Change-Id: If1f39ff160b4305ef057d50bb1f01d2c45f1579d

2011-12-06 11:11:13 -08:00

api

Fix issue #5714517: App shortcuts can result in bad task intents

2011-12-05 17:42:41 -08:00

build

New dalvik heap config for xhdpi devices.

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

cmds

resolved conflicts for merge of 0c0120ef to ics-aah

2011-12-06 11:11:13 -08:00

core

resolved conflicts for merge of 0c0120ef to ics-aah

2011-12-06 11:11:13 -08:00

data

resolved conflicts for merge of be6ab576 to ics-aah

2011-11-29 14:10:46 -08:00

docs

am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0

2011-12-02 12:46:51 -08: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

Followup to a bug fix.

2011-11-15 14:21:58 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1

2011-11-29 17:48:12 -08:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

am e21dabf6: Merge "Initialize bwr.read_buffer in IPCThreadState::talkWithDriver." into ics-mr1

2011-12-01 22:06:35 -08:00

location

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

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

media

Merge "AudioService: Send broadcasts when master volume and mute state change" into ics-aah

2011-12-05 18:57:49 -08:00

native

Fix application launch shortcuts.

2011-11-29 12:17:22 -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

add a way to access the version string of the h/w implementation of EGL

2011-11-29 18:00:35 -08:00

packages

resolved conflicts for merge of 0c0120ef to ics-aah

2011-12-06 11:11:13 -08:00

policy

resolved conflicts for merge of 0c0120ef to ics-aah

2011-12-06 11:11:13 -08:00

sax

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

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

services

resolved conflicts for merge of 0c0120ef to ics-aah

2011-12-06 11:11:13 -08:00

telephony

Be careful sharing connections when dun is in play

2011-12-02 16:42:18 -08:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

am f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1

2011-11-29 16:57:46 -08:00

tools

Use the new get/putFlattenable methods on RpcData.

2011-12-04 21:13:23 -08:00

voip

SIP: turn off verbose logs.

2011-11-18 16:57:21 -08:00

wifi/java/android/net/wifi

Switch to notifications for walled garden

2011-12-05 14:12:06 -08:00

Android.mk

am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0

2011-12-02 12:49:42 -08: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%