Robert Greenwalt d1c3ea6a21 resolved conflicts for merge of 3cd6a3e3 to master ...

Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7

2010-05-26 10:37:48 -07:00

..

Applications.java

Support for apps search in apps provider contract

2010-03-31 14:32:09 +01:00

BaseColumns.java

auto import from //depot/cupcake/@135843

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

Browser.java

Add a bulk request method for bookmark icons.

2010-04-12 14:26:13 -04:00

Calendar.java

Added access fields for second timezone columns.

2010-05-03 11:40:35 -07:00

CallLog.java

New method to return the last dialed number

2010-01-15 10:41:56 -08:00

Contacts.java

Remove the IM provider contract class.

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

ContactsContract.java

move favorites and my contacts group handling to the

2010-04-27 12:19:37 -07:00

Downloads.java

Add a new permission and remove createTitleFromFilename.

2010-02-05 11:18:34 -05: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

merge from open-source master

2010-05-19 09:20:22 -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 3cd6a3e3 to master

2010-05-26 10:37:48 -07:00

SocialContract.java

Fix missed Aggregate->Contact name change.

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

SyncConstValue.java

deprecate SyncConstValue, since it is now only used by the deprecated ContactsProvider interface

2010-02-25 16:52:05 -08:00

SyncStateContract.java

add a transaction monitor

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

Telephony.java

Add a new meta_data column

2010-03-11 13:37:17 -08:00

UserDictionary.java

auto import from //depot/cupcake/@135843

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