Jean-Baptiste Queru b7db580e42 resolved conflicts for merge of cd6e3484 to master

2009-12-10 07:48:35 -08:00

api

am c99f154b: am dcd8bad3: Merge change Ia28d9547 into eclair-mr2

2009-12-10 07:06:00 -08:00

awt

Removed system/framework/android.awt.jar.

2009-07-02 14:11:33 -05:00

build

auto import from //depot/cupcake/@135843

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

calendar

Generate a calendar static Java library.

2009-12-01 17:42:41 -08:00

camera

Add missing library in linker option. Currently the library is used by the

2009-12-09 16:32:04 -08:00

cmds

am f553a584: am 5921fb51: Merge change I91eb0354 into eclair-mr2

2009-12-07 18:32:57 -08:00

common

Add OperationScheduler (and test) to the common static library;

2009-11-21 10:09:46 -08:00

core

am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2

2009-12-10 07:06:25 -08:00

data

Add 4 new notification sounds.

2009-11-23 17:26:37 -08:00

docs

am aeabdf32: am 0766b2d0: Update service example code.

2009-12-10 07:00:47 -08:00

graphics

am 54f5ca41: am ffacbc34: am fd2f6358: Merge change I771bebb9 into eclair

2009-12-07 18:35:48 -08:00

include

am e6c0e993: Merge change I129483f8 into eclair-mr2

2009-12-09 15:51:21 -08:00

keystore

Add unit test for the new keystore.

2009-09-29 15:20:24 +08:00

libs

am 5cd6fcd5: am e6c0e993: Merge change I129483f8 into eclair-mr2

2009-12-10 07:06:45 -08:00

location/java

GpsLocationProvider: Do not release wakelock until the GPS engine is fully off

2009-12-07 18:46:55 -05:00

media

am 30807a45: am 7c55c3f5: Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.

2009-12-10 07:04:09 -08:00

obex

Update OBEX to fix missing several contact entries issue.

2009-11-10 15:34:18 -08:00

opengl

Merge change I5ddc721d

2009-12-09 16:07:57 -08:00

packages

am 1224b101: am 42c4c589: am a9791d30: Merge change Iae3ed706 into eclair

2009-12-02 20:29:40 -08:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

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

services

am d44c2f2c: am 1270e2e2: Merge change I96ddd6e2 into eclair-mr2

2009-12-10 07:06:25 -08:00

telephony

am 94985152: am d5b325aa: Add WSP header to WAP_PUSH_RECEIVED intent in addition to data Import CL 146651 from //branches/cupcake_dcm

2009-12-02 20:48:07 -08:00

test-runner

am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.

2009-12-04 00:53:53 -08:00

tests

am 8d962613: am 6dba0680: Merge change I9589f9c2 into eclair-mr2

2009-12-07 14:58:38 -08:00

tools

am 5cd6fcd5: am e6c0e993: Merge change I129483f8 into eclair-mr2

2009-12-10 07:06:45 -08:00

vpn/java/android/net/vpn

Fix broken build.

2009-11-25 12:49:24 +08:00

wifi/java/android/net/wifi

Add wifi "HANGED" driver state triggering reload.

2009-10-23 11:12:47 -07:00

Android.mk

am 5d0806c9: Merge change Ia70bd8c4 into eclair

2009-12-03 16:13:19 -08:00

cleanspec.mk

Rename [I]DropBox[Service] to [I]DropBoxManager[Service].

2009-11-12 13:58:27 -08:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

Start using CLDR for some date-and-time strings and formats.

2009-05-15 10:15:50 -07:00

preloaded-classes

resolved conflicts for merge of cd6e3484 to master

2009-12-10 07:48:35 -08:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%