Dianne Hackborn 939461300a resolved conflicts for merge of 070a19e0 to master ...

Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411

2011-05-23 14:10:26 -07:00

api

resolved conflicts for merge of 070a19e0 to master

2011-05-23 14:10:26 -07:00

build

…

cmds

resolved conflicts for merge of b2d0ee16 to master

2011-05-19 15:02:18 -07:00

core

resolved conflicts for merge of 070a19e0 to master

2011-05-23 14:10:26 -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

…

include

resolved conflicts for merge of 06a8ceac to master

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

keystore

Move to KeyChain.bind

2011-05-17 16:20:36 -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 "Bug 4184736 unhide MediaPlayer.setTexture"

2011-05-20 15:42:31 -07:00

native

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21: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

eglTerminate() now actually frees up all active egl objects

2011-05-16 19:03:33 -07:00

packages

am 7d75e772: am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2

2011-05-21 21:34:56 -07:00

policy

resolved conflicts for merge of 06a8ceac to master

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

sax

…

services

Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"

2011-05-23 09:06:03 -07:00

telephony

am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE

2011-05-19 11:32:27 -07:00

test-runner

Rework display size access.

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

tests

Merge "RTL Ordering of visual elements in LinearLayout"

2011-05-20 17:39:40 -07:00

tools

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21: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

am 5b9ceeba: am a4815c0e: am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2

2011-05-19 15:17:33 -07:00

Android.mk

First pass at NetworkPolicy and activity tracking.

2011-05-13 16:20:21 -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

…

NOTICE

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%