The Android Open Source Project 12dacd90c4 merge 84ce47e64f w/minor conflicts

2009-05-22 07:48:37 -07:00

api

Fix public.xml to clean up Eclair's public resources.

2009-05-21 18:42:51 -07:00

awt

auto import from //depot/cupcake/@135843

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

build

auto import from //depot/cupcake/@135843

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

camera/libcameraservice

am 7283fb18: Merge commit \'7b7225c8fdbead25235c74811b30ff4ee690dc58\' into manual_merge

2009-05-21 10:27:18 -07:00

cmds

this should fix the build

2009-05-21 19:59:24 -07:00

core

fix build breakage

2009-05-22 13:05:23 +09:00

data

split boot animation out of SurfaceFlinger

2009-05-21 19:21:59 -07:00

docs

am 51b22d74: am 221c9552: AI 148972: fix link to the installing guide to 1.5; fix a couple layout bugs in the document. BUG=1860640

2009-05-19 01:19:23 -07:00

graphics/java

Fix typos.

2009-05-13 17:51:37 -07:00

im/java/android/im

auto import from //depot/cupcake/@135843

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

include

Merge change 2260

2009-05-21 16:32:55 -07:00

libs

am 69a6c3eb: Merge change 2292 into donut

2009-05-21 19:36:53 -07:00

location/java

am 8c690ea9: Merge change 2182 into donut

2009-05-21 09:42:38 -07:00

media

am c1c82509: Merge change 2163 into donut

2009-05-20 22:44:17 -07:00

opengl

am bb7b7b31: Merge change 2152 into donut

2009-05-20 22:44:06 -07:00

packages

Fix bug #1863517: use the new signature for data message token in SubscribedFeedsIntentService.

2009-05-20 09:59:56 -07:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

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

services

am 8c690ea9: Merge change 2182 into donut

2009-05-21 09:42:38 -07:00

telephony/java

Make sure smsHeader != null before using it.

2009-05-20 12:55:25 -07:00

test-runner

am 8c690ea9: Merge change 2182 into donut

2009-05-21 09:42:38 -07:00

tests

am cfcc0df2: Merge change 2285 into donut

2009-05-21 18:18:21 -07:00

tools

Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'

2009-05-20 22:41:10 -07:00

wifi/java/android/net/wifi

Increment BatteryStatsImpl's VERSION.

2009-05-19 15:53:54 -07:00

Android.mk

am 8c690ea9: Merge change 2182 into donut

2009-05-21 09:42:38 -07: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

merged 231cc608d0

2009-05-06 00:28:37 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%