Ajay Panicker 0a3411a29b resolve merge conflicts of 06b8324d02 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I29b117df6803fd59faafe97a02b8ab2d34741f0e

2017-05-04 17:12:27 -07:00

..

AlarmClock.java

Add documentation about Android TV devices may not support the alarm

2017-03-31 16:29:11 -07:00

BaseColumns.java

…

BlockedNumberContract.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

Adding voicemail transcription state to the database

2017-04-26 14:27:35 -07:00

Contacts.java

Fix some issues found by new doclava linter.

2017-04-25 13:12:45 -06:00

ContactsContract.java

Voice Messaging Intent API.

2017-04-28 13:35:35 -07:00

ContactsInternal.java

…

DocumentsContract.java

Merge "Unhide FLAG_SUPPORT_EJECT and related methods."

2017-03-24 01:23:53 +00:00

DocumentsProvider.java

Merge "Unhide FLAG_SUPPORT_EJECT and related methods."

2017-03-24 01:23:53 +00:00

Downloads.java

Add legacy DownloadManager actions to SystemApi.

2017-04-04 14:38:47 -06:00

FontRequest.java

Font API clean up

2017-04-26 18:00:17 +00:00

FontsContract.java

Remove FontVariationAxis.InvalidFormatException.

2017-04-28 15:24:40 -07:00

LiveFolders.java

…

MediaStore.java

Fix some issues found by new doclava linter.

2017-04-25 13:12:45 -06:00

OneTimeUseBuilder.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

resolve merge conflicts of 06b8324d02 to master

2017-05-04 17:12:27 -07:00

SettingsStringUtil.java

API for notification listener for Companioon apps

2017-04-14 19:01:53 -07:00

SyncConstValue.java

…

SyncStateContract.java

…

TimeZoneRulesDataContract.java

More time zone update API classes

2017-05-04 14:11:09 +01:00

UserDictionary.java

…

VoicemailContract.java

Adding voicemail transcription state to the database

2017-04-26 14:27:35 -07:00