Dianne Hackborn 5101b95710 resolve merge conflicts of e174476 to master ...

Change-Id: I4005cf91b8a6bf3faa2301d8ce97ab1ad5eed94f

2016-06-01 12:01:38 -07:00

..

AlarmClock.java

…

BaseColumns.java

…

BlockedNumberContract.java

Update BlockedNumberContract javadocs.

2016-05-18 16:39:56 -07:00

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

Un-@hide multi-endpoint APIs.

2016-05-06 03:07:45 +00:00

Contacts.java

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

ContactsContract.java

Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev

2016-05-06 12:06:29 +00:00

ContactsInternal.java

Launch managed quick contacts without contact id

2016-01-25 21:32:44 +00:00

DocumentsContract.java

Don't show new-window item in Downloads per Gabe.

2016-05-10 16:25:58 -07: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

resolve merge conflicts of e174476 to master

2016-06-01 12:01:38 -07:00

SyncConstValue.java

Add missing @Deprecated annotations.

2016-05-24 15:22:55 -07:00

SyncStateContract.java

…

UserDictionary.java

Documented that UserDictionary is not directly available anymore.

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

VoicemailContract.java

Merge "Hide VoicemailContract.setQuota()" into nyc-dev

2016-05-20 01:07:52 +00:00