Jason Monk 90a788e29b resolve merge conflicts of d70ed99 to master ...

Change-Id: I3a8d3708e050b3fb963dd057c0be9d2d249d037a

2016-08-30 10:54:03 -04: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

…

DocumentsContract.java

Remove EXTRA_SHOW_FILESIZE.

2016-08-22 20:09:11 +00:00

DocumentsProvider.java

Docsui-level work for implementing Eject on Roots list.

2016-07-08 00:03:57 +00:00

Downloads.java

…

LiveFolders.java

…

MediaStore.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

resolve merge conflicts of d70ed99 to master

2016-08-30 10:54:03 -04:00

SyncConstValue.java

Add missing @Deprecated annotations.

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

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add carrier regex config values for VisualVoicemailSmsFilter

2016-08-23 15:42:31 +00:00