Jake Hamby 0cb17a52ee resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp ...

Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275

2011-06-06 15:33:37 -07:00

..

AlarmClock.java

Add new Alarm provider class for setting an alarm.

2010-09-24 13:52:14 -04:00

Applications.java

Support for apps search in apps provider contract

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

BaseColumns.java

…

Browser.java

Add a bulk request method for bookmark icons.

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

Calendar.java

Adds time zone functionality into fw as a hidden api

2010-09-14 11:16:08 -07:00

CallLog.java

…

Contacts.java

…

ContactsContract.java

DO NOT MERGE: Private API to pass the selected tab through QuickContacts

2010-10-14 11:26:18 -07:00

Downloads.java

Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService

2010-12-09 07:48:55 -08:00

DrmStore.java

…

LiveFolders.java

…

MediaStore.java

Add support for the "compilation" tag in mp3, mp4 and ogg, and also add

2011-01-06 15:05:06 -08:00

OpenableColumns.java

…

package.html

…

SearchRecentSuggestions.java

…

Settings.java

am 8dd85f80: Merge "Move Wifi Ap configuration to flat file" into gingerbread

2011-05-11 09:45:36 -07:00

SocialContract.java

…

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

…

Telephony.java

resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp

2011-06-06 15:33:37 -07:00

UserDictionary.java

…