Dianne Hackborn e746f03c6c resolved conflicts for merge of 53686433 to master ...

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d

2010-09-13 16:56:10 -07:00

api

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

build

…

cmds

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

core

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

data

am fd3f44b3: am e1aa82a4: Merge "Adding a feature denoting support for 5 or more fully independent multitouch pointers." into gingerbread

2010-09-03 15:14:57 -07:00

docs

am 4cf0f45d: am 3b202844: am 51c18989: docs: update platform dashboard

2010-09-10 14:51:23 -07:00

drm

Make DRM libraries optional

2010-09-10 12:46:57 -07:00

graphics

am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread

2010-09-10 02:35:50 -07:00

icu4j

…

include

Merge changes I68379740,I9053218f

2010-09-12 20:41:07 -07:00

keystore

Remove the use of FileInputStream.available()

2010-09-09 16:28:48 -07:00

libs

Forces windows to draw the first time they show.

2010-09-13 12:52:37 -07:00

location

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

media

am 4d987850: am bd2e9ec6: Merge "Fix volume problems with insert revert" into gingerbread

2010-09-13 14:42:59 -07:00

native

resolved conflicts for merge of a05088c1 to master

2010-09-08 13:02:55 -07:00

obex

…

opengl

Add support for KHR_fence_sync

2010-09-10 14:01:45 -07:00

packages

Accessibility support for WebViews

2010-09-13 10:21:34 -07:00

policy

am 40e3af61: am 8abc9e9b: Merge "Don\'t play a sound if a volume key press is canceled." into gingerbread

2010-09-12 18:16:32 -07:00

sax

…

services

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

telephony

am a5dce0c1: am 3d7606aa: SIP: enhance timeout and registration status feedback.

2010-09-13 02:50:26 -07:00

test-runner

Add getApplicationContext to the mock implementation.

2010-09-07 14:27:25 -07:00

tests

Merge "Added overridePreference() layoutTestsController function."

2010-09-13 10:54:28 -07:00

tools

am fa888784: am 89fef418: Merge "Avoid pre-processing images when they won\'t be used"

2010-09-10 15:01:56 -07:00

voip

am a5dce0c1: am 3d7606aa: SIP: enhance timeout and registration status feedback.

2010-09-13 02:50:26 -07:00

vpn

…

wifi/java/android/net/wifi

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

Android.mk

Make @deprecated without comment an error.

2010-09-10 15:55:44 -04:00

CleanSpec.mk

update clean spec

2010-09-08 15:24:49 -04:00

MODULE_LICENSE_APACHE2

…

NOTICE

Adding PacketVideo attribution in NOTICE.

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

preloaded-classes

New API and implementation of DB and memory-backed FDs

2010-08-18 15:39:52 +01:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%