Dianne Hackborn a7f88508d3 resolved conflicts for merge of 872a1e79 to master ...

Change-Id: I50253b22f181729d4e748970acf1a3ad868ccd74

2011-06-16 16:01:27 -07:00

api

resolved conflicts for merge of 872a1e79 to master

2011-06-16 16:01:27 -07:00

build

Fix the naming of the heap growth limit property.

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

cmds

Merge "Add an option to force to use HW codec in stagefright cmd tool"

2011-06-13 18:47:20 -07:00

core

resolved conflicts for merge of 872a1e79 to master

2011-06-16 16:01:27 -07:00

data

Merge "Latest drop of DroidSansFallback.ttf from Monotype"

2011-06-14 20:23:15 -07:00

docs

resolved conflicts for merge of 872a1e79 to master

2011-06-16 16:01:27 -07:00

drm

Merge "-Fix some typo -Remove one unnecessary memory allocation"

2011-06-16 10:23:04 -07:00

graphics

Properly refcount SurfaceTexture in the JNI layer.

2011-06-15 16:14:26 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

Use rand() for MinGW

2011-06-15 20:55:49 -07:00

keystore

New KeyChain API for application access to keystore credentials

2011-06-10 10:43:02 -07:00

libs

Merge "Adding ability to read back fbo data to renderscript"

2011-06-16 15:15:14 -07:00

location

Use passive provider for location based country detection

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

media

Merge "Add new open source test contents. Removed old test files. Updated the tests with new test contents."

2011-06-15 18:47:55 -07:00

native

Add ParcelSurfaceTexture Java class to enable ISurfaceTexture sharing via Binder.

2011-06-09 11:59:23 -07:00

nfc-extras

NFC: Submit the missing pieces of previous commit to fix build.

2011-06-10 15:22:28 -07:00

obex

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

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

opengl

Properly refcount SurfaceTexture in the JNI layer.

2011-06-15 16:14:26 -07:00

packages

DO NOT MERGE

2011-06-16 14:21:04 -07:00

policy

am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE

2011-06-16 12:49:17 -07:00

sax

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

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

services

Add permission to fix NetworkPolicy tests.

2011-06-16 14:03:43 -07:00

telephony

am 03cbb58e: am ff42c04d: Merge "Support SIM permanently disabled state." into honeycomb-LTE

2011-06-16 12:49:17 -07:00

test-runner

Test runner cleanup: delete unused old classes.

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

tests

Merge "Adding ability to read back fbo data to renderscript"

2011-06-16 15:15:14 -07:00

tools

am 810dc598: am f1c5dbbd: am abd4dffc: Merge "New orientation handling. Only impacts SDK (aapt dump badging)." into honeycomb-mr2

2011-06-16 14:57:59 -07:00

voip

Merge "Move WakeupTimer out of SipService."

2011-06-15 03:17:50 -07:00

vpn

Make VpnService synchronous API.

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

wifi/java/android/net/wifi

am 241b65ac: am 5f350512: Merge "Reset connections AFTER we take down the network." into honeycomb-LTE

2011-06-16 12:50:46 -07:00

Android.mk

resolved conflicts for merge of 872a1e79 to master

2011-06-16 16:01:27 -07:00

CleanSpec.mk

KeyChain API refinements

2011-06-09 21:11:06 -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

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%