Sailesh Nepal 607c51aadb resolve merge conflicts of 2cff241 to master ...

Change-Id: Ide7a24bb36c51a24bd4107c3042efc3117ea76f6

2016-08-23 08:10:12 -07:00

..

AlarmClock.java

…

BaseColumns.java

…

BlockedNumberContract.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

…

Contacts.java

…

ContactsContract.java

…

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

[media] Separate ringtones for managed profiles

2016-08-18 09:58:26 +01:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add carrier regex config values for VisualVoicemailSmsFilter

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