James Dong 9fe05b7bc1 resolved conflicts for merge of 1cbf8493 to master ...

Change-Id: Ifea2ba8b02ecf291fbd1612973647a95a70511c4

2011-03-16 15:53:03 -07:00

api

am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1

2011-03-16 12:35:42 -07:00

build

…

cmds

…

core

Merge "Fix a bogus comment on LruCache.hitCount()"

2011-03-16 15:05:10 -07:00

data

…

docs

am e8f95e7f: docs: update device dashboard

2011-03-15 11:28:50 -07:00

drm

Merge "Bug fixes of DRM framework."

2011-03-15 14:10:30 -07:00

graphics

2X2 matrix needs 4 float elements.

2011-03-15 14:47:31 -07:00

icu4j

…

include

Add 3D mode key and others.

2011-03-16 11:31:42 -07:00

keystore

…

libs

am f8c4c128: am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1

2011-03-15 23:50:43 -07:00

location

…

media

resolved conflicts for merge of 1cbf8493 to master

2011-03-16 15:53:03 -07:00

native

Add 3D mode key and others.

2011-03-16 11:31:42 -07:00

nfc-extras

…

obex

…

opengl

am 0ea44ac0: am 00f47af8: Merge "SurfaceTexture: disallow unsupported uses." into honeycomb-mr1

2011-03-15 13:01:27 -07:00

packages

am 89de72d8: am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1

2011-03-16 12:35:55 -07:00

policy

…

sax

…

services

am 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1

2011-03-15 23:50:45 -07:00

telephony

am a74887e8: am 56c4c442: Merge "Lazy initialization must be synchronized to avoid parallel instances cretation."

2011-03-15 12:05:37 -07:00

test-runner

…

tests

…

tools

Merge "Improve VelocityTracker numerical stability."

2011-03-15 20:01:16 -07:00

voip

…

vpn

…

wifi/java/android/net/wifi

Update WakeLock-related docs to mention permissions

2011-03-16 09:38:11 -07:00

Android.mk

…

CleanSpec.mk

…

GenerationCache.h

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

preloaded-classes

…

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%