Robert Greenwalt 3bc074d1f0 resolved conflicts for merge of b27ce984 to honeycomb-plus-aosp ...

Change-Id: Ib9d24c211461329955288180978a7c5d383bba75

2011-01-28 09:06:30 -08:00

api

am ce3b35a7: Merge "bug:3398527 return List insttead of ArrayList from public API" into honeycomb

2011-01-27 15:00:38 -08:00

build

Hook up large heap API.

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

cmds

…

core

am 0250bc2f: Merge "Catch exception when ViewRoot\'s surface is not valid. Bug #3399426" into honeycomb

2011-01-27 15:43:03 -08:00

data

Merge "Fix emulator touchscreen." into honeycomb

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

docs

am d1ca9aa5: am 591a5f86: Doc change: fix adt archive filename.

2011-01-27 10:10:49 -08:00

drm

…

graphics

Update package descriptions with editorial revisions.

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

icu4j

…

include

am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source." into honeycomb

2011-01-26 14:45:41 -08:00

keystore

Update the path of the intent to unlock keystore.

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

libs

am a45c056e: Merge "Fix display List bugs" into honeycomb

2011-01-26 23:51:58 -08:00

location

Update package descriptions with editorial revisions.

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

media

am 64a2c359: Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb

2011-01-27 15:03:36 -08:00

native

…

obex

…

opengl

egl: clear error on function entry

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

packages

Merge "Pushing in fixed scrubber asset" into honeycomb

2011-01-27 15:47:31 -08:00

policy

am da910fd5: Merge "Handle ActivityNotFoundException in the WM policy." into honeycomb

2011-01-26 23:54:16 -08:00

sax

…

services

am 13a8f2a5: Merge "Comment out the isAvailable optimization." into honeycomb

2011-01-26 17:32:10 -08:00

telephony

Enable recovery in RIL wakelock release check.

2011-01-26 14:40:36 -08:00

test-runner

…

tests

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

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

tools

LayoutLib: Properly compute available space to layouts.

2011-01-27 15:41:38 -08:00

voip

…

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

resolved conflicts for merge of 77ba255e to honeycomb-plus-aosp

2011-01-26 18:47:13 -08:00

CleanSpec.mk

Hook up large heap API.

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

MODULE_LICENSE_APACHE2

…

NOTICE

…

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%