Kenny Root 9ca6d71c52 resolved conflicts for merge of c6bf3eaa to master ...

Change-Id: I6421faf52c160a81b03c63b91f1aedfe0f151cac

2010-10-15 11:20:42 -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

Fix deleting browser history.

2010-09-16 00:46:48 -05:00

BrowserContract.java

Add a Settings table to BrowserContract.

2010-09-28 16:41:10 -05:00

Calendar.java

am 86e19914: am b92788aa: Merge "Adds time zone functionality into fw as a hidden api" into gingerbread

2010-09-15 11:38:26 -07:00

CallLog.java

Store the current country in call log

2010-08-31 09:59:13 +08:00

Contacts.java

…

ContactsContract.java

Adding PHOTO_URI and PHOTO_THUMBNAIL_URI.

2010-09-22 14:24:15 -07:00

Downloads.java

bug:3069735 in Download UI app, handle deletes correctly

2010-10-13 16:18:44 -07:00

DrmStore.java

Fix for the incorrect size of the new added DRM file. (bug 2897238)

2010-09-03 10:45:51 -07:00

LiveFolders.java

…

MediaStore.java

MediaStore: Add helper method to create Uri for querying genre for an audio file

2010-09-27 13:16:43 -04:00

Mtp.java

MTP host: Use Java longs for storage and object IDs

2010-09-21 10:41:33 -04:00

OpenableColumns.java

…

package.html

…

SearchRecentSuggestions.java

…

Settings.java

Fix 3024528: Add owner info to SecureSettings.

2010-10-14 15:51:55 -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

am a3100314: Merge "Remove some PII." into gingerbread

2010-10-12 14:21:10 -07:00

UserDictionary.java

…