Robert Greenwalt ac6ec41b67 resolved conflicts for merge of 4e33e9c1 to master ...

Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b

2010-04-08 13:54:58 -07:00

..

Applications.java

Support for apps search in apps provider contract

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

BaseColumns.java

…

Browser.java

Use a secure setting for default browser geolocation permissions

2010-03-25 14:04:45 +00:00

Calendar.java

b/2483233 Made each reminder time a unique intent

2010-03-17 16:19:27 -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

Add the hidden ACTION_GET_MULTIPLE_PHONES and EXTRA_PHONE_URIS:

2010-04-08 21:55:46 +08: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

Make createVideoThumbnail and createImageThumbnail look consistent.

2010-04-05 13:06:39 -07:00

OpenableColumns.java

…

package.html

…

SearchRecentSuggestions.java

…

Settings.java

Add service to monitor/control the flow of data.

2010-04-08 12:34:45 -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

…