Eric Laurent 240677ec68 resolved conflicts for merge of dd206093 to master ...

Change-Id: I21dd2321a4839d034d49092baccbf40986f17dae

2010-07-20 13:37:19 -07:00

api

Initial changes to allow collections in widgets.

2010-07-19 14:48:31 -07:00

awt

…

build

…

cmds

am c74034b6: am 24651682: added BinderService<> template to help creating native binder services

2010-07-14 20:18:50 -07:00

core

Merge "deleted ScoSocket.java and android_bluetooth_ScoSocket.cpp"

2010-07-20 12:47:45 -07:00

data

am cbbc035b: am de1057c4: Unhide new API for supporting multiple cameras.

2010-06-27 20:54:36 -07:00

docs

am 3dfa6ec5: am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo

2010-07-19 14:57:29 -07:00

graphics

Add program for linear gradient.

2010-07-16 23:18:27 -07:00

icu4j

…

include

resolved conflicts for merge of dd206093 to master

2010-07-20 13:37:19 -07:00

keystore

…

libs

Fixing potential buffer overrun errors.

2010-07-20 10:59:25 -07:00

location

Don't throw an exception from isProviderEnabled and getLastKnownLocation

2010-07-17 08:21:33 -04:00

media

resolved conflicts for merge of dd206093 to master

2010-07-20 13:37:19 -07:00

native

am 9c37e5ad: am 75a91389: Merge "Implement native key pre-dispatching to IMEs." into gingerbread

2010-07-16 09:12:29 -07:00

obex

…

opengl

Fix extraMath state variable.

2010-07-19 18:01:39 -07:00

packages

Move more of the system bar to the layout.

2010-07-15 16:35:29 -04:00

policy

Overflow menu for action bars.

2010-07-16 10:22:31 -07:00

sax

…

services

resolved conflicts for merge of dd206093 to master

2010-07-20 13:37:19 -07:00

telephony

Merge "Handle call list in CallManager."

2010-07-19 13:42:37 -07:00

test-runner

Merge "DO NOT MERGE Doc Change: Javadoc for test case classes" into gingerbread

2010-07-13 09:46:38 -07:00

tests

Add support for linear gradients.

2010-07-19 18:44:05 -07:00

tools

Fix the layoutlib Paint.set(Paint) method. Do not merge.

2010-07-19 10:19:49 -07:00

vpn

…

wifi/java/android/net/wifi

Pass network properties to ConnectivityService.

2010-07-13 18:07:41 -07:00

Android.mk

Initial changes to allow collections in widgets.

2010-07-19 14:48:31 -07:00

CleanSpec.mk

The status bar draws its icons now.

2010-06-02 14:48:41 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

Adding PacketVideo attribution in NOTICE.

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

preloaded-classes

frameworks/base updates to track merge from dalvik-dev

2010-06-30 00:54:29 -07:00

Description

No description provided

5.1 GiB

Languages

Java 77.3%

Kotlin 9.2%

PowerBuilder 6.6%

C++ 5.5%

AIDL 1%