Jim Miller 3530ebe451 resolved conflicts for merge of 578e73da to honeycomb-plus-aosp ...

Change-Id: I334ae5382220a84881521885b6e3c3991fd8bbb0

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

api

am 981df1d9: Merge "unhide functions used by reflected files for SDK." into honeycomb

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

build

Add some standard definitions for device heaps.

2010-12-23 15:41:16 -08:00

cmds

merge 83fdc69e from gingerbread - do not merge

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

core

resolved conflicts for merge of 578e73da to honeycomb-plus-aosp

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

data

Merge "Updated notification sounds for trygon" into honeycomb

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

docs

am 2150553d: cherrypick Change-Id: I1365c6c45f8e1f75ee4afbc52c32778d21b97be4 from master docs: Rewrite of App Fundamentals.. Part 2. This introduces three new docs:

2011-01-14 14:10:14 -08:00

drm

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

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

graphics

unhide functions used by reflected files for SDK.

2011-01-16 15:05:52 -08:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

am a7393dd6: Merge "Fix error reporting in Surface::cancelBuffer()" into honeycomb

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

keystore

Use deliberately public API rather than org.apache cruft.

2010-11-11 16:42:09 -08:00

libs

Merge "Fix bug in on-device linking." into honeycomb

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

location

resolved conflicts for merge of ee27dd35 to master

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

media

am e7df0dde: Merge "Fixed thrashing in the cached buffer during 720p YT video streaming" into honeycomb

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

native

Introduce NDK API for 64-bit assets

2010-12-13 12:02:19 -08:00

obex

Bluetooth OBEX timeout problem.

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

opengl

Hardware Composer Test hwcCommit set blend type

2011-01-10 18:03:05 -08:00

packages

Make the notification settings view less janky.

2011-01-16 13:10:11 -08:00

policy

resolved conflicts for merge of 578e73da to honeycomb-plus-aosp

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

sax

…

services

Merge "Fix WPS to provides immediate feedback" into honeycomb

2011-01-16 13:02:57 -08:00

telephony

Set mIsMinInfoReady and mCurrentOtasp before notifcations.

2011-01-15 07:47:03 -08:00

test-runner

Add the {get,set}PackageObbPaths calls to API

2011-01-14 12:18:48 -08:00

tests

Fix 9patch rendering in ExpandableListView.

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

tools

LayoutLib: update logs to use new data bundle

2011-01-14 16:56:00 -08:00

voip

Merge "Add auth. username in SipProfile." from gingerbread.

2011-01-12 11:43:27 +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

Report WPS overlap error

2011-01-16 13:13:15 -08:00

Android.mk

Import libcore_to_document definition from libcore/Docs.mk

2011-01-05 17:52:36 -08:00

CleanSpec.mk

libstagefright: Compile MP3 & AAC decoders in 32bit ARM Mode

2010-12-09 12:00:58 -08:00

MODULE_LICENSE_APACHE2

…

NOTICE

Fix merge conflict for 'c506ab89'

2011-01-13 11:48:42 -08:00

preloaded-classes

am 73cd0c39: am 7dbeb24a: This class no longer exists.

2010-11-05 13:12:48 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%