Andreas Huber db85b54395 resolved conflicts for merge of 3d630e86 to master ...

Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e

2011-11-30 09:53:40 -08:00

api

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

2011-11-29 13:17:42 -08:00

build

…

cmds

am 18f05518: am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1

2011-11-23 11:29:24 -08:00

core

Merge "Allow multiple TextToSpeech instances per calling app."

2011-11-30 02:45:22 -08:00

data

Fix application launch shortcuts.

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

docs

am a181a919: am 37ac88f9: Merge "Update description of account_type" into ics-mr1

2011-11-23 12:16:21 -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 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1

2011-11-29 16:33:04 -08:00

keystore

…

libs

Add support for sending VSYNC events to the framework

2011-11-29 13:10:25 -08:00

location

…

media

resolved conflicts for merge of 3d630e86 to master

2011-11-30 09:53:40 -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

…

opengl

am ea54d0dc: am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1

2011-11-21 21:23:49 -08:00

packages

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

2011-11-29 13:17:42 -08:00

policy

Display max retry lockout message on backup lock fixes 5462647

2011-11-29 20:49:08 -05:00

sax

…

services

Merge "Add camera focus move callback."

2011-11-29 18:45:06 -08:00

telephony

am 08b52112: am e95f4986: Merge "Fix a build break." into ics-mr1

2011-11-23 16:51:47 -08:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1

2011-11-28 18:00:36 -08:00

tools

am 496f6e2a: am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

2011-11-28 16:57:17 -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

Merge "Redesign p2p around provision discovery"

2011-11-29 14:52:18 -08:00

Android.mk

Add the support libraries to the platform documentation (build).

2011-11-17 15:56:13 -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%