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

…

BaseColumns.java

…

BlockedNumberContract.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

…

Contacts.java

…

ContactsContract.java

…

ContactsInternal.java

…

DocumentsContract.java

…

DocumentsProvider.java

…

Downloads.java

…

FontRequest.java

…

FontsContract.java

…

LiveFolders.java

…

MediaStore.java

…

OneTimeUseBuilder.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

…

SettingsStringUtil.java

…

SyncConstValue.java

…

SyncStateContract.java

…

TimeZoneRulesDataContract.java

…

UserDictionary.java

…

VoicemailContract.java

…