yuanjiahsu 8eb9d4711b resolve merge conflicts of 2cb9a70cac to master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1db72d57f3003bcec0fd8f7fbb2dc4ec7b5dcf3

2018-09-17 23:46:14 +08:00

..

AlarmClock.java

…

BaseColumns.java

…

BlockedNumberContract.java

Update BlockedNumberContract to indicate why a call was blocked.

2018-08-20 13:45:36 -07:00

Browser.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

BrowserContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

CalendarContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

CallLog.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

Contacts.java

…

ContactsContract.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

ContactsInternal.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

DocumentsContract.java

docs: fixed instances of typo in 'overridden' am: debd4ee72d

2018-09-13 15:11:27 -07:00

DocumentsProvider.java

docs: fixed instances of typo in 'overridden'

2018-09-13 11:40:59 -07:00

Downloads.java

Add @UnsupportedAppUsage annotations

2018-08-10 09:37:35 +01:00

FontRequest.java

…

FontsContract.java

…

LiveFolders.java

…

MediaStore.java

Mark deprecated APIs, support column greylisting.

2018-09-13 17:14:27 -06:00

MetadataReader.java

…

OneTimeUseBuilder.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

docs: fixed instances of typo in 'overridden'

2018-09-13 11:40:59 -07:00

SearchRecentSuggestions.java

…

Settings.java

resolve merge conflicts of 2cb9a70cac to master

2018-09-17 23:46:14 +08:00

SettingsSlicesContract.java

…

SettingsStringUtil.java

…

SettingsValidators.java

Allow restore of settings with nullable components

2018-05-22 11:11:58 +01:00

SyncConstValue.java

…

SyncStateContract.java

…

TimeZoneRulesDataContract.java

…

UserDictionary.java

…

VoicemailContract.java

…