Dianne Hackborn 678d344bcb resolved conflicts for merge of b9e2f68b to master ...

Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142

2011-06-03 14:15:10 -07:00

api

Merge "Response to code review for GridLayout:"

2011-06-03 13:46:34 -07:00

build

Fix the naming of the heap growth limit property.

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

cmds

KeyStore.reset changes

2011-06-02 16:24:45 -07:00

core

resolved conflicts for merge of b9e2f68b to master

2011-06-03 14:15:10 -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 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f

2011-06-03 13:16:29 -07:00

drm

Fix memory leak from retrieval of getSupportedDrmInfo.

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

graphics

Improve validation in RS FieldPacker.

2011-06-02 19:36:41 -07:00

icu4j

…

include

resolved conflicts for merge of 54cb63e2 to master

2011-06-02 16:44:52 -07:00

keystore

Restore ResponseCodes for use with getLastError

2011-06-01 15:29:29 -07:00

libs

Merge "Restore from a previous full backup's tarfile"

2011-06-01 15:14:36 -07:00

location

Use passive provider for location based country detection

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

media

Merge "Don't advertise the (old-style) software decoders unless they're actually present."

2011-06-02 14:24:20 -07:00

native

resolved conflicts for merge of 54cb63e2 to master

2011-06-02 16:44:52 -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

resolved conflicts for merge of b9e2f68b to master

2011-06-03 14:15:10 -07:00

policy

resolved conflicts for merge of b9e2f68b to master

2011-06-03 14:15:10 -07:00

sax

…

services

am 7322e557: am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2

2011-06-03 13:17:00 -07:00

telephony

am 903cd57f: am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE

2011-06-03 13:58:47 -07:00

test-runner

Test runner cleanup: delete unused old classes.

2011-06-01 20:03:39 -07:00

tests

Merge "Response to code review for GridLayout:"

2011-06-03 13:46:34 -07:00

tools

resolved conflicts for merge of 54cb63e2 to master

2011-06-02 16:44:52 -07:00

voip

update for new audio.h header location

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

vpn

…

wifi/java/android/net/wifi

Add new states to support wpa_supplicant 0.8

2011-06-02 11:18:00 -07:00

Android.mk

Collect historical network stats.

2011-06-01 17:44:52 -07:00

CleanSpec.mk

Collect historical network stats.

2011-06-01 17:44:52 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

resolved conflicts for merge of 00118a48 to honeycomb-merge

2011-01-27 18:25:32 -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%