The Android Open Source Project 575d1af980 resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -07: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

am a1590586: Merge change 5578 into donut

2009-06-29 20:18:08 -07: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

Moving send-to-voicemail and ringtone-uri up to the aggregate level.

2009-06-25 16:38:06 -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

Fix http://code.google.com/p/android/issues/detail?id=3059

2009-06-30 10:32:00 -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

resolved conflicts for merge of cf098294 to master

2009-07-03 08:55:59 -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

SyncConstValue.java

change the sync framework and users to understand Account

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

Telephony.java

mods so that we can search mms messages

2009-06-22 14:55:17 -07:00

UserDictionary.java

auto import from //depot/cupcake/@135843

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