Dianne Hackborn fee1c69a49 resolved conflicts for merge of 77dd616e to master ...

Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2

2011-05-25 16:36:50 -07:00

api

Bluetooth SCO audio API improvements.

2011-05-25 09:11:46 -07:00

build

Fix the naming of the heap growth limit property.

2011-02-01 20:21:48 -08:00

cmds

Support wrapping app processes to inject debug instrumentation.

2011-05-24 12:01:25 -07:00

core

resolved conflicts for merge of 77dd616e to master

2011-05-25 16:36:50 -07:00

data

am a49b2dbd: am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."

2011-05-19 03:44:45 -07:00

docs

am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1

2011-05-19 11:13:41 -07:00

drm

Fix memory leak from retrieval of getSupportedDrmInfo.

2011-04-24 12:40:16 -07:00

graphics

Preparing libRS for for compilation on host.

2011-05-17 16:42:24 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846"

2011-05-24 14:26:18 -07:00

keystore

Remove need for onActivityResult from KeyChain API

2011-05-25 10:27:46 -07:00

libs

Merge "Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default"

2011-05-20 13:15:20 -07:00

location

Use passive provider for location based country detection

2011-04-28 16:18:19 -07:00

media

Merge "Convert line breaks to Unix style"

2011-05-25 12:37:07 -07:00

native

resolved conflicts for merge of bbca8133 to master

2011-05-24 11:27:11 -07:00

nfc-extras

Implement dead service recovery in NFC extras library.

2011-04-26 16:38:00 -07:00

obex

am 0c2d82c6: am 848a1e3d: Merge "OBEX: Fix PrivateOutputStream small write problem"

2011-05-20 10:51:25 -07:00

opengl

fix x86 build

2011-05-23 17:48:36 -07:00

packages

am 59a3319f: am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2

2011-05-23 20:48:36 -07:00

policy

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

sax

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

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

services

Merge "Disable pointer debug logging."

2011-05-24 14:42:18 -07:00

telephony

am 5faaaa5f: am 543c3146: Merge "Handle ProvideLocalInfo stk command." into honeycomb-LTE

2011-05-24 19:53:59 -07:00

test-runner

Rework display size access.

2011-04-21 15:17:52 -07:00

tests

In DRT2, correctly handle the case of zero tests

2011-05-24 18:54:14 +01:00

tools

resolved conflicts for merge of bbca8133 to master

2011-05-24 11:27:11 -07:00

voip

update for new audio.h header location

2011-05-12 14:09:57 -07:00

vpn

Make VpnService synchronous API.

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

wifi/java/android/net/wifi

am c2ff0e70: am 9a737639: Merge "Clear network id when invalid" into honeycomb-LTE

2011-05-24 19:53:04 -07:00

Android.mk

Remove need for onActivityResult from KeyChain API

2011-05-25 10:27:46 -07:00

CleanSpec.mk

The decoder wrapper is no longer needed. Also disable building old-style decoders.

2011-05-12 11:24:13 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

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

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

preloaded-classes

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%