Bryce Lee fb1cf36aa7 resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev ...

Change-Id: I9e4cabd2d8a34a348ae888f096c8d3c35226e960

2014-10-22 16:56:08 -07:00

..

AlarmClock.java

Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev

2013-08-29 17:52:32 +00:00

BaseColumns.java

…

Browser.java

Remove WebIconDatabase calls from android.provider.Browser

2014-06-09 17:50:34 -07:00

BrowserContract.java

…

CalendarContract.java

Make more calendar alarms exact

2013-07-18 17:41:32 -07:00

CallLog.java

resolved conflicts for merge of 66c16547 to lmp-sprout-dev

2014-09-13 20:10:08 +00:00

Contacts.java

API changes per API review for contacts

2014-06-04 18:16:26 -07:00

ContactsContract.java

ContactsContract API changes per API review

2014-09-04 16:51:53 -07:00

DocumentsContract.java

Define EXTRA_SIZE for ContentProviders.

2014-08-27 15:13:57 -07:00

DocumentsProvider.java

Define EXTRA_SIZE for ContentProviders.

2014-08-27 15:13:57 -07:00

Downloads.java

Allow saving to Downloads.

2013-09-23 14:23:45 -07:00

LiveFolders.java

…

MediaStore.java

Put in real "code" (aka marketing) name.

2014-10-07 20:17:19 -07:00

OpenableColumns.java

Start fleshing out new storage APIs.

2013-05-01 17:21:06 -07:00

package.html

…

SearchIndexableData.java

Add userId as a new field for SearchIndexableData

2014-07-10 16:39:08 +00:00

SearchIndexableResource.java

Fix constructors for SearchIndexableData and SearchIndexableResource

2014-04-11 15:15:34 -07:00

SearchIndexablesContract.java

Update SearchIndexablesContract for adding UserId

2014-07-10 19:22:46 +00:00

SearchIndexablesProvider.java

SearchIndexablesProvider - support for querying for non indexable data keys

2014-04-11 18:45:44 -07:00

SearchRecentSuggestions.java

…

Settings.java

resolved conflicts for merge of f03ba4f1 to lmp-mr1-dev

2014-10-22 16:56:08 -07:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add TRANSCRIPTION column to Calls table

2014-07-14 10:05:31 -07:00