Mike Lockwood e6f3f54e05 resolved conflicts for merge of b107f4de to master ...

Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e

2011-05-16 16:08:12 -04:00

api

am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2

2011-05-16 11:09:31 -07:00

build

…

cmds

am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2

2011-05-16 11:06:28 -07:00

core

resolved conflicts for merge of fc4a3d37 to master

2011-05-16 15:49:53 -04:00

data

am ee081bf5: am 3ed0a1ec: Merge "IMS: Provide net_admin permission so that IPSec could be configured/used." into honeycomb-LTE

2011-05-03 16:36:36 -07:00

docs

am 0c5ae3fc: am 1f2a335f: am 79d3f630: am 904f4810: doc change: added link to diydrones and a few small changes

2011-05-16 12:37:46 -07:00

drm

Fix memory leak from retrieval of getSupportedDrmInfo.

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

graphics

Cleanup mesh creation.

2011-05-12 10:49:39 -07:00

icu4j

…

include

Support platform and camera dependent recording start time offset

2011-05-14 07:18:43 -07:00

keystore

Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult

2011-04-22 15:45:22 -07:00

libs

Merge "Full backup tweaks"

2011-05-13 15:41:32 -07:00

location

Use passive provider for location based country detection

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

media

resolved conflicts for merge of b107f4de to master

2011-05-16 16:08:12 -04:00

native

Add initial API for stylus and mouse buttons.

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

nfc-extras

Implement dead service recovery in NFC extras library.

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

obex

am 24a16e6c: am c34c88b9: am ec1a8f7a: Merge "Unable to push files to Windows 7"

2011-04-19 16:01:36 -07:00

opengl

fix (Again) adding OES postfix when looking for gl functions

2011-05-11 20:37:47 -07:00

packages

Full backup tweaks

2011-05-13 15:38:02 -07:00

policy

Merge changes I21e9629e,I535ed3ba

2011-05-11 09:31:08 -07:00

sax

…

services

resolved conflicts for merge of fc4a3d37 to master

2011-05-16 15:49:53 -04:00

telephony

am 2ead69e1: am fe5b5d37: Merge "Implement incremental data stall recovery in GSM DCT" into honeycomb-LTE

2011-05-16 13:03:21 -07:00

test-runner

Rework display size access.

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

tests

Merge "change how test sets timeout for webkit dump"

2011-05-16 11:28:17 -07:00

tools

am d0054160: am 6d040a7f: am 738c5e60: am 2fae858d: LayoutLib: implement data binding for most AdapterView

2011-05-13 16:43:37 -07:00

voip

update for new audio.h header location

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

vpn

…

wifi/java/android/net/wifi

resolved conflicts for merge of db46fa25 to master

2011-05-02 14:41:57 -07:00

Android.mk

Full local backup infrastructure

2011-05-10 17:52:51 -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

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%