The Android Open Source Project 7f4b66cb92 am 5f773b9f: Reconcile gingerbread-plus-aosp and honeycomb ...

* commit '5f773b9f72367ed8046df257d20881fd96f86929':
  resolved conflicts for merge of a314f32b to honeycomb-merge

2011-01-30 12:54:18 -08:00

api

am bf9f3ea7: Merge 34afc2cd from gingerbread-plus-aosp

2011-01-29 08:50:38 -08:00

build

Hook up large heap API.

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

cmds

dumpstate: improved collection, better error handling.

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

core

resolved conflicts for merge of c608e106 to master

2011-01-30 12:50:09 -08:00

data

am ab865ba7: am 9371f703: Merge "New honeycomb sound set" into honeycomb

2011-01-28 19:24:10 -08:00

docs

am 51bae7e7: am 30a85ec7: am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread

2011-01-29 09:00:41 -08:00

drm

Bug 3361124 Remove drmioserver, continued

2011-01-21 09:06:19 -08:00

graphics

Merge "Fix for an IOOBoundsException in Paint." into honeycomb

2011-01-28 10:58:53 -08:00

icu4j

…

include

am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

2011-01-29 23:10:33 -08:00

keystore

Update the path of the intent to unlock keystore.

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

libs

am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

2011-01-29 23:10:33 -08:00

location

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00

media

am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb

2011-01-28 11:53:50 -08:00

native

Merge "Add joystick support to framework."

2011-01-17 15:57:44 -08:00

obex

Bluetooth OBEX timeout problem.

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

opengl

Add GL11ExtensionPack support to GLDebugWrapper

2011-01-27 14:46:52 -08:00

packages

resolved conflicts for merge of c608e106 to master

2011-01-30 12:50:09 -08:00

policy

am 2e4b9985: am 6354dd0b: Merge "Fix 3403858: Remove lock icons from status1 area." into honeycomb

2011-01-28 16:28:55 -08:00

sax

…

services

resolved conflicts for merge of c608e106 to master

2011-01-30 12:50:09 -08:00

telephony

am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp

2011-01-29 09:35:28 -08:00

test-runner

Remove API that snuck into MockPackageManager

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

tests

Delete browerplugin tests - do not merge

2011-01-29 07:41:39 -08:00

tools

am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"

2011-01-29 23:07:48 -08:00

voip

do not merge bug 3370834 Cherrypick from master

2011-01-26 11:20:01 -08:00

vpn

Make VpnService synchronous API.

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

wifi/java/android/net/wifi

Make the interface with DHCP IPv6 capable.

2011-01-26 09:10:01 -08:00

Android.mk

am 796f1af0: Merge "resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-01-26 19:13:54 -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%