Kenny Root 7dbf0696ef resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp ...

Change-Id: Ie9b0166b0260ee7eea7bdd275e64f2714024bf1c

2011-01-26 11:10:36 -08:00

api

am 4fbca2b6: Merge "Change AsyncTask.execute() back to using a thread pool..." into honeycomb

2011-01-25 22:08:16 -08:00

build

Hook up large heap API.

2011-01-19 16:13:18 -08:00

cmds

Publish MediaMetadataRetriever.java as public API

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

core

resolved conflicts for merge of 2c1d0967 to honeycomb-plus-aosp

2011-01-26 11:10:36 -08:00

data

Merge "Fix emulator touchscreen." into honeycomb

2011-01-26 10:46:29 -08:00

docs

am 31e5c30f: Merge "docs: revise and amend platform notes for preview" into honeycomb

2011-01-25 14:48:19 -08:00

drm

am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb

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

graphics

Fix bitmap meshes to work in display lists.

2011-01-23 16:36:11 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

include

am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb

2011-01-25 18:20:35 -08:00

keystore

Update the path of the intent to unlock keystore.

2011-01-20 20:23:59 +08:00

libs

am 39740e1e: Merge "Fix b/2943524: On-device linking the rs_cl." into honeycomb

2011-01-26 10:39:46 -08:00

location

resolved conflicts for merge of ee27dd35 to master

2010-12-07 13:17:37 -08:00

media

am 4991a00b: Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb

2011-01-25 22:46:41 -08:00

native

Add API to get path to OBBs.

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

obex

Bluetooth OBEX timeout problem.

2010-10-27 16:13:59 -07:00

opengl

egl: clear error on function entry

2011-01-25 15:36:21 -08:00

packages

Updating phone assets to Gingerbread

2011-01-26 07:39:16 -08:00

policy

am 3168a137: Merge "Fix surface frame size reporting." into honeycomb

2011-01-25 14:48:14 -08:00

sax

Re-arrange android-common so framework no longer links with it.

2010-02-25 11:39:33 -08:00

services

am 2ec4af59: am 138757db: Merge "Make OBB results a one-way call" into gingerbread

2011-01-26 10:11:21 -08:00

telephony

am d8b525c3: Merge "Increase the default timeout from 30 to 60 seconds." into honeycomb

2011-01-26 10:16:43 -08:00

test-runner

Remove API that snuck into MockPackageManager

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

tests

Merge "Fit and finish on status bar:" into honeycomb

2011-01-25 18:56:32 -08:00

tools

LayoutLib: return ViewInfo for all merged items + Build init.

2011-01-25 15:55:16 -08:00

voip

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

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

vpn

Make VpnService synchronous API.

2011-01-20 12:51:43 +08:00

wifi/java/android/net/wifi

Merge "Handle EAP authentication failure" into honeycomb

2011-01-19 17:58:19 -08:00

Android.mk

Doc change: adding missing samples

2011-01-19 19:57:37 -08:00

CleanSpec.mk

Hook up large heap API.

2011-01-19 16:13:18 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

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

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

preloaded-classes

Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle

2011-01-24 18:17:21 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%