Kenny Root f25d24b2c7 resolved conflicts for merge of 8b1082bb to master ...

Change-Id: If9d898123894c53bf83ac28cc7c03cd849c8ef17

2010-10-15 13:10:01 -07:00

api

resolved conflicts for merge of c6bf3eaa to master

2010-10-15 11:20:42 -07:00

build

…

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 a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread

2010-10-15 12:44:39 -07:00

data

…

docs

am 5cfa877e: am eb4ef072: am 5249ad03: docs: add "boot completed" broadcast to list of DO NOTs for installing on external storage bug: 3088494

2010-10-15 00:07:26 -07:00

drm

…

graphics

Fix object cast.

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

icu4j

…

include

am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread

2010-10-15 08:33:43 -07:00

keystore

Use explicit intent for installing credentials.

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

libs

Merge "Fix deadlock on RS teardown."

2010-10-15 11:28:56 -07:00

location

…

media

am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread

2010-10-15 08:33:23 -07:00

native

am 2f98a585: am 49ec3dff: Merge "OBB: Change documentation to reflect reality" into gingerbread

2010-10-15 08:32:30 -07:00

obex

…

opengl

…

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

…

services

am 5bfa3a34: am 011b5bcc: Merge "implement part of [3094280] New animation for screen on and screen off add support for screen on animation" into gingerbread

2010-10-15 08:33:43 -07:00

telephony

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

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

test-runner

…

tests

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

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

tools

resolved conflicts for merge of 8b1082bb to master

2010-10-15 13:10:01 -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

…

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

…

NOTICE

…

preloaded-classes

resolved conflicts for merge of 8b1082bb to master

2010-10-15 13:10:01 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%