Fred Quintana 435e427d69 fix a incorrect merge

2009-06-04 17:30:28 -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

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

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

resolved conflicts w/ 842a1f4b0b merge....

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

ContactsContract.java

fix a incorrect merge

2009-06-04 17:30:28 -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

handle OTR messages by storing them in an in-memory table; remove groupchat message urls since we can get to messages by thread ids.

2009-05-20 13:07:37 -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

add Gservices settings for adaptive heartbeat parameters and wifi heartbeat interval.

2009-06-03 16:09:59 -07:00

SocialContract.java

Making sure non-public API is marked with @hide.

2009-05-28 18:06:31 -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

Telephony support for SMS memory reporting to the network.

2009-05-29 14:22:36 -07:00

UserDictionary.java

auto import from //depot/cupcake/@135843

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