Dianne Hackborn f3b57def93 resolved conflicts for merge of 7e193916 to master ...

Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5

2011-06-03 12:26:54 -07:00

api

Merge "Add API to allow plugins to lock their orientation in full-screen mode."

2011-06-03 05:50:16 -07:00

build

…

cmds

KeyStore.reset changes

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

core

am 42f53c7e: am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2

2011-06-03 11:11:22 -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 092b0bd9: am de43d71b: am f128d5d4: Merge "docs: adjust what\'s visible for online and offline docs" into honeycomb-mr2

2011-06-02 16:22:39 -07:00

drm

…

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

Merge "Import revised translations."

2011-06-03 10:22:58 -07:00

policy

Restore status bar on phones.

2011-06-03 01:27:06 -04:00

sax

…

services

resolved conflicts for merge of 7e193916 to master

2011-06-03 12:26:54 -07:00

telephony

am 1bbcc695: am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."

2011-06-02 18:53:25 -07:00

test-runner

Test runner cleanup: delete unused old classes.

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

tests

Merge "Update BiDiTest app"

2011-06-02 16:37:32 -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

…

preloaded-classes

…

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%