Andreas Huber 175a7505a6 am ea427b0c: resolved conflicts for merge of 26f70db9 to master ...

* commit 'ea427b0c87a52d5e770f50856401a81ff2658cc4':
  Remove surface legacy APIs and code.

2011-11-09 14:36:37 +00:00

api

am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"

2011-11-08 14:04:18 +00:00

build

…

cmds

resolved conflicts for merge of 26f70db9 to master

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

core

am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1

2011-11-08 16:41:32 +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

…

libs

Fix possible leak in Parcel::writeDupFileDescriptor.

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

location

…

media

resolved conflicts for merge of 26f70db9 to master

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

native

fix the float Rect in OpenGLRenderer to handle NANs

2011-09-19 16:50:07 -07:00

nfc-extras

…

obex

…

opengl

Merge "Properly passing an unused variable through."

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

packages

am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1

2011-11-08 03:50:34 +00:00

policy

am 4d8ecc65: Merge "Fix 5231823: PIN/Password polish on lock screen" into ics-mr1

2011-11-07 22:29:08 +00:00

sax

…

services

am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1

2011-11-08 16:37:11 +00:00

telephony

Remain in call audio mode while phone is offhook.

2011-11-07 15:45:18 -08:00

test-runner

Fix ownership of CursorWindows across processes.

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

tests

am 84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1

2011-11-08 02:51:40 +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%