Sailesh Nepal 2cff2417cd resolve merge conflicts of ad31603 to cw-f-dev ...

am: bbfb97461d

Change-Id: I8c497533297df55ef4aac85ca2d0d981a057b9d4

2016-08-23 14:15:31 +00: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

…

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

Fix javadoc broken links in DocumentsContract.

2016-07-13 10:14:59 +09:00

DocumentsProvider.java

…

Downloads.java

API changes for DownloadManager and JobScheduler.

2016-04-24 14:39:34 -06:00

LiveFolders.java

…

MediaStore.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

Assist: Allow disabling the disclosure animation am: 2335bd6787

2016-08-12 23:16:53 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add carrier regex config values for VisualVoicemailSmsFilter

2016-08-19 11:43:15 -07:00