Wei-Ta Chen 2e206ff8b9 am 62cd5c97: (-s ours) am 61d9ffbf: Merge "Do not merge." into gingerbread ...

* commit '62cd5c9788abbd5b715ec2a6eaf64dd3945fdbaf':
  Do not merge.

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

api

am 9aba2324: Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb

2011-01-13 11:31:03 -08:00

build

Add some standard definitions for device heaps.

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

cmds

Publish MediaMetadataRetriever.java as public API

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

core

am a3cdaa53: Revert "Remove the APIs for the old encryption scheme."

2011-01-13 12:18:40 -08:00

data

Merge "Updated notification sounds for trygon" into honeycomb

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

docs

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

2011-01-11 14:51:21 -08:00

drm

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

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

graphics

Merge "Add getTransformMatrix to the SurfaceTexture API." into honeycomb

2011-01-13 11:29:14 -08:00

icu4j

…

include

am 21f62b9e: Merge "Add a method enable encryption." into honeycomb

2011-01-13 07:44:55 -08:00

keystore

Use deliberately public API rather than org.apache cruft.

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

libs

Merge "Cleanup implementation of hardware layers." into honeycomb

2011-01-13 12:13:59 -08:00

location

resolved conflicts for merge of ee27dd35 to master

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

media

am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb

2011-01-13 10:24:44 -08:00

native

Introduce NDK API for 64-bit assets

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

obex

…

opengl

Hardware Composer Test hwcCommit set blend type

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

packages

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

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

policy

Merge "Fix 3201849: Use custom Drawable for bg in lockscreen" into honeycomb

2011-01-12 13:14:33 -08:00

sax

…

services

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

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

telephony

Turn off DUN connection after tethering.

2011-01-12 15:52:10 -08:00

test-runner

Prevent ActivityTestCase from erasing constants.

2011-01-07 12:06:47 -08:00

tests

Improve error handling (NPE in DRT2)

2011-01-13 14:16:20 +00:00

tools

LAyoutLib: Fix build by adding missing IWindowSession implementation.

2011-01-13 10:43: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

Fix network availability reporting

2011-01-11 12:11:36 -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%