Gloria Wang 9580b8ce65 resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp ...

Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76

2010-10-07 15:27:17 -07:00

api

resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp

2010-10-07 15:27:17 -07:00

build

…

cmds

am 19058877: Merge "refactored screenshot code" into gingerbread

2010-10-04 20:06:51 -07:00

core

am b74941e3: Merge "Fixed popup assets (background)" into gingerbread

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

data

Adding a feature to indicate that the device possesses low-latency audio.

2010-09-26 17:28:30 -07:00

docs

am b50d5ede: am 30264c9b: Merge "Doc change: Adding new docs for Device Admin API." into froyo

2010-10-05 23:45:29 -07:00

drm

Update of DRM framework.

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

graphics

am eb6e22f2: Merge "Document Bitmap.createScaledBitmap" into gingerbread

2010-10-04 12:23:58 -07:00

include

resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp

2010-10-07 15:27:17 -07:00

keystore

Remove the use of FileInputStream.available()

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

libs

am 78d15acf: Merge "Make secure views tolerate IME overlays." into gingerbread

2010-10-05 13:17:04 -07:00

location

Remove old location classes.

2010-09-28 17:50:50 -07:00

media

am 949f7d90: Merge "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder." into gingerbread

2010-10-07 14:02:26 -07:00

native

Fix night/notnight resource folder handling.

2010-09-30 11:26:02 +02:00

obex

Add ABORT support to Obex lib

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

opengl

am 524a6d8e: Merge "better fix for [3028370] GL get error should return a valid error if no context is bound." into gingerbread

2010-09-23 18:17:08 -07:00

packages

New assets for buttons and notification

2010-10-06 14:32:29 -07:00

policy

Fix issue #3041660: Camera image flips upside down when rotating device

2010-10-04 14:01:39 -07:00

sax

…

services

am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread

2010-10-07 14:01:55 -07:00

telephony

am 08fb5851: Merge "Add flag to skip restoring network seletion." into gingerbread

2010-10-07 14:00:53 -07:00

test-runner

Allow all apps to call ContentResolver.getType().

2010-09-26 21:31:47 -07:00

tests

am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread

2010-10-05 14:45:28 -07:00

tools

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

2010-10-07 07:16:51 -07:00

voip

Make SipService broadcast SIP_SERVICE_UP when it's up.

2010-10-07 09:15:25 +08:00

vpn

DO NOT MERGE

2010-03-29 18:12:24 -07:00

wifi/java/android/net/wifi

am 0859b764: Make wifi scan async. (don\'t auto-merge)

2010-09-21 12:59:34 -07:00

Android.mk

NFC integration

2010-09-28 22:36:27 -07:00

CleanSpec.mk

Reorganize MountService IPC

2010-08-20 13:17:12 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

Adding PacketVideo attribution in NOTICE.

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

preloaded-classes

Tracking merge of dalvik-dev to gingerbread

2010-08-04 23:47:38 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%