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

..

BaseColumns.java

auto import from //depot/cupcake/@135843

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

Browser.java

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

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

Calendar.java

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

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

CallLog.java

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

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

Checkin.java

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

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

Contacts.java

Merge commit 'korg/cupcake'

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

Downloads.java

auto import from //depot/cupcake/@135843

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

DrmStore.java

auto import from //depot/cupcake/@135843

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

Gmail.java

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

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

Im.java

auto import from //depot/cupcake/@135843

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

LiveFolders.java

auto import from //depot/cupcake/@135843

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

MediaStore.java

auto import from //depot/cupcake/@135843

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

OpenableColumns.java

auto import from //depot/cupcake/@135843

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

package.html

auto import from //depot/cupcake/@135843

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

SearchRecentSuggestions.java

auto import from //depot/cupcake/@135843

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

Settings.java

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

2009-03-25 15:18:27 -07:00

SubscribedFeeds.java

auto import from //depot/cupcake/@135843

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

Sync.java

auto import from //depot/cupcake/@135843

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

SyncConstValue.java

auto import from //depot/cupcake/@135843

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

Telephony.java

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

2009-03-24 18:48:25 -07:00

UserDictionary.java

auto import from //depot/cupcake/@135843

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