Gilles Debunne f9bb1cd1fc resolved conflicts for merge of fb729202 to master ...

Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0

2011-12-06 15:57:47 -08:00

api

am 1113e755: am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1

2011-12-06 10:32:51 -08:00

build

New dalvik heap config for xhdpi devices.

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

cmds

am ec42750e: am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1

2011-12-05 19:20:45 -08:00

core

resolved conflicts for merge of fb729202 to master

2011-12-06 15:57:47 -08:00

data

Fix application launch shortcuts.

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

docs

am 939a3dd4: 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 17:57:14 -08: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

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

2011-11-30 10:50:52 -08:00

keystore

Make the KeyChain handled its own grants rather than having

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

libs

Merge "Clip text correctly Bug #5706056"

2011-12-05 11:56:09 -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 07bacabe to master

2011-12-05 13:31:17 -08:00

native

am c339fe30: am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1

2011-11-29 13:17:42 -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

gltrace: Make framebuffer contents an optional message.

2011-12-05 14:13:16 -08:00

packages

am 1113e755: am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1

2011-12-06 10:32:51 -08:00

policy

Merge "Making Face Unlock fix that wasn't proerly merged in master"

2011-12-06 07:25:59 -08:00

sax

…

services

Merge "Move native vold calls to varargs."

2011-12-06 10:38:55 -08:00

telephony

am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1

2011-12-02 17:57:37 -08:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

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

2011-11-30 10:50:42 -08:00

tools

Merge "Upgrade layoutlib generation code to use ASM 4.0"

2011-12-06 13:31:04 -08:00

voip

am 0e67685e: am bfd85f9a: Merge "SIP: turn off verbose logs." into ics-mr1

2011-11-21 21:07:56 -08:00

wifi/java/android/net/wifi

Switch to notifications for walled garden

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

Android.mk

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

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%