Brad Fitzpatrick bd80a12cba resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp ...

Change-Id: I6e595bb11a5a692ccd730b9d1d2aa367063a61f5

2011-01-19 15:19:08 -08:00

api

resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp

2011-01-19 15:19:08 -08:00

build

Add a property for specifying a dalvik heap growth limit.

2011-01-19 12:33:12 -08:00

cmds

merge 83fdc69e from gingerbread - do not merge

2011-01-14 18:33:51 -08:00

core

resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp

2011-01-19 15:19:08 -08:00

data

…

docs

am ea6a3c70: Merge "Minor updates." into honeycomb

2011-01-18 18:39:36 -08:00

drm

am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"

2011-01-13 12:38:29 -08:00

graphics

Fix race condition between GC thread and

2011-01-18 18:12:26 -08:00

icu4j

…

include

am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb

2011-01-19 10:06:23 -08:00

keystore

…

libs

Don't attempt to create empty layers.

2011-01-19 14:38:29 -08:00

location

…

media

am c4edeb5a: Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition

2011-01-19 14:13:41 -08:00

native

Add API to get path to OBBs.

2011-01-16 18:43:04 -08:00

obex

…

opengl

Unhide GLSurfaceView.get/setPreserveEGLContextOnPause

2011-01-18 15:53:25 -08:00

packages

Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb

2011-01-18 22:39:20 -08:00

policy

am 661b6cfb: Merge "Okay, new plan for dialogs." into honeycomb

2011-01-18 18:40:22 -08:00

sax

…

services

Merge "StrictMode: class instance limits (track object "leaks")" into honeycomb

2011-01-19 14:53:24 -08:00

telephony

Merge "Enable AUTO_TIME_ZONE settings." into honeycomb

2011-01-18 11:43:53 -08:00

test-runner

Remove API that snuck into MockPackageManager

2011-01-17 13:13:37 -08:00

tests

Make embedded hardware layers work.

2011-01-19 13:42:26 -08:00

tools

LayoutLib: properly configure ApplicationInfo with targetSdkVersion.

2011-01-17 22:58:41 -08:00

voip

Merge "Merge "SipService: registers broadcast receivers on demand."" into honeycomb

2011-01-18 02:25:52 -08:00

vpn

Revert "Remove the APIs for the old encryption scheme."

2011-01-13 14:15:43 -06:00

wifi/java/android/net/wifi

Fix soft Ap handling on system restart

2011-01-18 19:31:09 -08:00

Android.mk

Refactoring app widgets to address security/performance issues.

2011-01-18 22:57:09 -08:00

CleanSpec.mk

…

MODULE_LICENSE_APACHE2

…

NOTICE

resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp

2011-01-17 14:17:12 -08:00

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%