The Android Open Source Project e1861133d5 Merge commit 'korg/cupcake' ...

Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes

2009-03-27 15:38:40 -07:00

..

accounts

auto import from //depot/cupcake/@135843

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

annotation

auto import from //depot/cupcake/@135843

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

app

Automated import from //branches/cupcake/...@142614,142614

2009-03-25 15:12:25 -07:00

appwidget

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

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

bluetooth

Automated import from //branches/cupcake/...@142761,142761

2009-03-25 15:43:42 -07:00

content

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

database

Merge commit 'remotes/korg/cupcake' into merge

2009-03-18 11:33:14 -07:00

ddm

auto import from //depot/cupcake/@135843

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

debug

auto import from //depot/cupcake/@135843

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

emoji

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

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

hardware

Automated import from //branches/cupcake/...@142799,142799

2009-03-25 16:45:05 -07:00

inputmethodservice

Automated import from //branches/cupcake/...@142829,142829

2009-03-25 18:37:33 -07:00

net

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

2009-03-19 23:08:54 -07:00

os

Automated import from //branches/cupcake/...@142996,142996

2009-03-26 15:33:04 -07:00

pim

auto import from //depot/cupcake/@135843

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

preference

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

2009-03-13 13:04:22 -07:00

provider

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

security

auto import from //depot/cupcake/@135843

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

server

Automated import from //branches/cupcake/...@141977,141977

2009-03-24 18:46:44 -07:00

speech

auto import from //depot/cupcake/@135843

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

syncml

Automated import from //branches/cupcake/...@142508,142508

2009-03-24 22:31:34 -07:00

test

auto import from //depot/cupcake/@135843

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

text

Automated import from //branches/cupcake/...@142861,142861

2009-03-25 21:53:33 -07:00

util

auto import from //depot/cupcake/@135843

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

view

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

webkit

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

widget

Merge commit 'korg/cupcake'

2009-03-27 15:38:40 -07:00

package.html

auto import from //depot/cupcake/@135843

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