Kenny Root 4a90f93781 resolved conflicts for merge of a127c07c to master ...

Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086

2010-10-14 23:58:41 -07:00

api

NFC API revision round 2.

2010-10-14 19:16:35 -07:00

build

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

cmds

am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread

2010-10-10 14:19:52 -07:00

core

am c7ee44cb: am dfc07279: Line up WebTextView text with the page.

2010-10-14 23:03:23 -07:00

data

am c6581a10: am 4e9751f0: Merge "Adding a feature to indicate that the device possesses low-latency audio. The specific criteria for low-latency audio are defined in the CDD, but since that hasn\'t yet been settled for Gingerbread, this change doesn\'t go into details

2010-09-27 11:45:51 -07:00

docs

Doc change: Merge commit 'd555e264' into manualmerge

2010-10-13 19:32:02 -07:00

drm

Update of DRM framework.

2010-10-04 22:14:53 +09:00

graphics

Fix object cast.

2010-10-14 17:57:30 -07:00

icu4j

Refactor Styled utility functions into reusable objects.

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

include

resolved conflicts for merge of a127c07c to master

2010-10-14 23:58:41 -07:00

keystore

Use explicit intent for installing credentials.

2010-10-08 08:21:17 +08:00

libs

Async type creation.

2010-10-14 17:48:46 -07:00

location

am cb51c0c7: am 3e94b94f: Merge "Remove old location classes." into gingerbread

2010-09-28 18:24:48 -07:00

media

resolved conflicts for merge of a127c07c to master

2010-10-14 23:58:41 -07:00

native

resolved conflicts for merge of 8bb7a1df to master

2010-10-13 15:43:51 -07:00

obex

Add ABORT support to Obex lib

2010-03-16 09:59:06 -07:00

opengl

libagl: eglSwapInterval fix

2010-10-06 16:44:37 -07:00

packages

Allow notifications to not specify a contentIntent.

2010-10-13 17:29:26 -07:00

policy

Fix 3024528: Add owner info to SecureSettings.

2010-10-14 15:51:55 -07:00

sax

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

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

services

am 1442818a: am c792c2e9: Merge "GPS: Remove unnecessary and broken test in AgpsRilInterface updateNetworkState glue" into gingerbread

2010-10-14 22:37:14 -07:00

telephony

am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread

2010-10-13 19:40:16 -07:00

test-runner

Allow all apps to call ContentResolver.getType().

2010-09-27 18:05:44 -07:00

tests

Merge "Implement LayoutTestController.overridePreference('WebKitUsesPageCachePreferenceKey')"

2010-10-14 04:46:42 -07:00

tools

am 556866a2: am 656d2165: Merge "Parser is optional in obtainStyledAttributes." into gingerbread

2010-10-08 17:59:13 -07:00

voip

am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread

2010-10-14 21:19:54 -07:00

vpn

Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources.

2010-01-29 13:35:51 -08:00

wifi/java/android/net/wifi

Remove synchronous bluetooth callbacks

2010-10-14 17:06:18 -07:00

Android.mk

NFC API revision round 2.

2010-10-14 19:16:35 -07:00

CleanSpec.mk

NFC API revision round 2.

2010-10-14 19:16:35 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

NOTICE

Adding PacketVideo attribution in NOTICE.

2010-05-06 14:15:47 -07:00

preloaded-classes

Delete unused WebView drag tracking code

2010-10-14 09:39:25 +01:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%