Jeff Sharkey 79014856cc resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp ...

Change-Id: I65f892594034c6de4ac17459c01e146fe4c4e377

2016-04-25 15:52:11 -06:00

..

AlarmClock.java

…

BaseColumns.java

…

BlockedNumberContract.java

Add an unblock API to BlockedNumberContract.

2016-03-23 19:29:59 -07:00

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

Hide multi-endpoint APIs.

2016-04-15 11:28:44 -07:00

Contacts.java

…

ContactsContract.java

Update comment about enterprise contact id and lookup key

2016-03-08 14:39:41 +00:00

ContactsInternal.java

…

DocumentsContract.java

Unhide DocumentsContract.EXTRA_ORIENTATION.

2016-03-31 10:30:46 +09:00

DocumentsProvider.java

Merge "Implement getDocumentStreamTypes() in DocumentsProvider." into nyc-dev

2016-02-17 11:34:12 +00:00

Downloads.java

API changes for DownloadManager and JobScheduler.

2016-04-24 14:39:34 -06:00

LiveFolders.java

…

MediaStore.java

Set label for links to resolver activities.

2016-04-12 15:44:00 -07:00

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

Merge "Doze settings example not matching real keys" am: 570a13f

2016-04-20 23:42:01 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

Documented that UserDictionary is not directly available anymore.

2016-03-21 16:46:05 -07:00

VoicemailContract.java

…