Kevin Chyn de57cea3c3 resolve merge conflicts of 2c712acefa to master ...

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

2019-09-26 21:09:25 -07:00

..

AlarmClock.java

…

BaseColumns.java

…

BlockedNumberContract.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

Convert some users of Time.format() to an alt.

2019-07-19 16:30:30 +01:00

CallLog.java

make CallerInfo as SystemAPI

2019-09-12 23:21:06 -07:00

Column.java

…

Contacts.java

…

ContactsContract.java

docs: Removed dates in obsolete field messages.

2019-08-06 18:21:18 -07:00

ContactsInternal.java

…

DeviceConfig.java

Move device config key high_refresh_rate_blacklist to display_manager

2019-09-03 17:02:11 -07:00

DocumentsContract.java

…

DocumentsProvider.java

…

Downloads.java

…

FontRequest.java

…

FontsContract.java

…

LiveFolders.java

…

MediaStore.java

Public APIs for ID-specific Uris, misc items.

2019-08-22 14:43:24 -06:00

MetadataReader.java

…

OneTimeUseBuilder.java

…

OpenableColumns.java

…

OWNERS

…

package.html

…

SearchIndexableData.java

Add missing nullability annotations.

2019-08-29 17:15:44 -07:00

SearchIndexableResource.java

Add missing nullability annotations.

2019-08-29 17:15:44 -07:00

SearchIndexablesContract.java

Update search indexable interface for dynamic indexing.

2019-09-23 11:27:38 +08:00

SearchIndexablesProvider.java

Update search indexable interface for dynamic indexing.

2019-09-23 11:27:38 +08:00

SearchRecentSuggestions.java

…

Settings.java

resolve merge conflicts of 2c712acefa to master

2019-09-26 21:09:25 -07:00

SettingsSlicesContract.java

…

SettingsStringUtil.java

…

SyncConstValue.java

…

SyncStateContract.java

…

TEST_MAPPING

Ignore broken tests, fix flaky tests.

2019-08-29 14:13:09 -06:00

TimeZoneRulesDataContract.java

…

UserDictionary.java

…

VoicemailContract.java

…