Leon Scroggins d6377fbe7e resolved conflicts for merge of 9336f5d9 to master

2009-06-22 12:44:31 -04: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

resolved conflicts for merge of 9336f5d9 to master

2009-06-22 12:44:31 -04:00

Calendar.java

Move meta feed handling to CalendarSyncAdapter

2009-06-12 15:43:00 -07:00

CallLog.java

Motorola additions for CDMA support without CdmaSuppConnTracker

2009-05-28 17:32:34 -07:00

Checkin.java

Record statistics about whether HTTP connections are reused.

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

Contacts.java

Copies the Contacts.Intents class to ContactsContract.

2009-06-19 14:51:04 -07:00

ContactsContract.java

Copies the Contacts.Intents class to ContactsContract.

2009-06-19 14:51:04 -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

Remove references to android.util.Config

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

Im.java

Fix bug 1875344 cut 2: adding option to show/noshow away presence when device is idle.

2009-06-09 13:12:01 -07:00

LiveFolders.java

auto import from //depot/cupcake/@135843

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

MediaStore.java

Change the media key algorithm to also ignore double quotes.

2009-05-22 12:22:16 -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 52546575: Merge change 4818 into donut

2009-06-19 16:43:46 -07:00

SocialContract.java

Added presence columns and changed constants to match provider.

2009-06-09 15:52: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

Add a search uri constant for mms/sms.

2009-06-10 17:07:31 -07:00

UserDictionary.java

auto import from //depot/cupcake/@135843

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