Jeff Hamilton bde0716dac resolved conflicts for merge of 08ace2e0 to master

2009-12-17 15:17:54 -06: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

Store info in the bookmarks/history database on whether it was a manually entered url.

2009-11-27 12:14:47 -05:00

Calendar.java

b/2224837 Changed the plumbing of how alerts/notifications work.

2009-12-15 15:24:34 -08:00

CallLog.java

Call the proper variant of markAsContacted.

2009-09-28 16:57:37 -07:00

Checkin.java

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

Contacts.java

Remove the IM provider contract class.

2009-12-17 13:47:36 -06:00

ContactsContract.java

Remove the IM provider contract class.

2009-12-17 13:47:36 -06:00

Downloads.java

auto import from //depot/cupcake/@135843

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

DrmStore.java

Support INSTALL_DRM permission

2009-07-24 16:57:02 -07:00

LiveFolders.java

Fix documentation.

2009-09-30 13:29:10 -07:00

MediaStore.java

Add convenience function to MediaStore to move a playlist item

2009-12-09 09:30:59 -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

Do not back up / restore the END_BUTTON_BEHAVIOR setting

2009-12-16 16:58:19 -08:00

SocialContract.java

Fix missed Aggregate->Contact name change.

2009-07-30 11:46:13 -07:00

SyncConstValue.java

change the sync framework and users to understand Account

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

SyncStateContract.java

add a transaction monitor

2009-09-08 17:25:09 -07:00

Telephony.java

Add WSP header to WAP_PUSH_RECEIVED intent in addition to data

2009-12-03 11:01:59 +09:00

UserDictionary.java

auto import from //depot/cupcake/@135843

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