Daisuke Miyakawa 7c3e18c558 resolved conflicts w/ 842a1f4b0b merge....

2009-05-19 23:13:14 +09:00

..

Applications.java

AI 147564: Merge back from search branch to donut. Notes:

2009-04-23 19:00:21 -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

change the sync framework and users to understand Account

2009-04-23 15:37:45 -07:00

CallLog.java

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

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

Checkin.java

Record statistics about whether HTTP connections are reused.

2009-05-18 12:35:09 -07:00

Contacts.java

resolved conflicts w/ 842a1f4b0b merge....

2009-05-19 23:13:14 +09: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

Remove references to android.util.Config

2009-04-09 15:30:38 -07:00

Im.java

store contact id in messages table instead of contact name string; merge messages and group messages tables.

2009-04-29 11:46:21 -07:00

LiveFolders.java

auto import from //depot/cupcake/@135843

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

MediaStore.java

AI 145994: Integrate #145778 from Donut.

2009-04-13 16:11:55 -07: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

am 2f11599e: Merge change 1579 into donut

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

SubscribedFeeds.java

change the sync framework and users to understand Account

2009-04-23 15:37:45 -07:00

Sync.java

Rewrite SyncStorageEngine to use flat files and in-memory data structures.

2009-05-05 15:40:53 -07:00

SyncConstValue.java

change the sync framework and users to understand Account

2009-04-23 15:37:45 -07:00

Telephony.java

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

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

UserDictionary.java

auto import from //depot/cupcake/@135843

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