Cary Clark bc2e33b5c8 don't swap out the history picture too soon ...

Wait until either the picture is not blank or
the progress is complete.

2009-04-24 10:43:02 -04:00

api

Regenerate current.xml after merge

2009-04-22 17:28:41 -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

Remove debug messages.

2009-04-22 16:22:01 +08:00

cmds

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

core

don't swap out the history picture too soon

2009-04-24 10:43:02 -04:00

data

AI 144741: am: CL 144740 am: CL 144739 More notification sounds

2009-04-06 18:39:53 -07:00

docs

AI 147338: am: CL 147336 Remove stuff relating to the Maps ext library from the docs. Leave a pointer over to code.google.com.

2009-04-22 13:38:45 -07:00

graphics/java

auto import from //branches/cupcake/...@137873

2009-03-11 12:11:56 -07:00

im/java/android/im

auto import from //depot/cupcake/@135843

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

include

Merge donut into master

2009-04-22 17:12:34 -07:00

libs

Merge donut into master

2009-04-22 17:12:34 -07:00

location

Merge donut into master

2009-04-22 17:12:34 -07:00

media

Merge donut into master

2009-04-22 17:12:34 -07:00

opengl

Manually merge 129, 174, and 233 from donut

2009-04-17 10:32:56 -07:00

packages

Merge branch 'readonly-p4-master'

2009-04-08 00:39:52 -07:00

sax/java/android/sax

auto import from //depot/cupcake/@135843

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

services

Merge donut into master

2009-04-22 17:12:34 -07:00

telephony/java

Changes for new ril.h.

2009-04-22 14:52:11 -07:00

test-runner

AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to

2009-04-21 11:54:14 -07:00

tests

Merge change 431

2009-04-22 18:51:09 -07:00

tools

Merge branch 'readonly-p4-master'

2009-04-20 16:17:25 -07:00

wifi/java/android/net/wifi

AI 146222: Manual merge of 145980 from donutburger => master.

2009-04-14 15:40:20 -07:00

Android.mk

Merge donut into master

2009-04-22 17:12:34 -07:00

MODULE_LICENSE_APACHE2

auto import from //depot/cupcake/@135843

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

NOTICE

auto import from //depot/cupcake/@135843

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

preloaded-classes

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.

2009-04-02 11:00:54 -07:00

Description

No description provided

21 GiB

Languages

Java 73.7%

Kotlin 14%

PowerBuilder 5.8%

C++ 5.2%

AIDL 1%