Bryce Lee bd17928afc resolve merge conflicts of 6b9e5bf0c2 to master. ...

Change-Id: Idada49313619533bfeb375ee232c942589457fa4

2015-12-18 03:05:20 +00:00

..

AlarmClock.java

…

BaseColumns.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

Allow to specify which user the call should be inserted to

2015-11-25 21:55:52 +00:00

Contacts.java

…

ContactsContract.java

Add Email.ENTEPRISE_CONTENT_FILTER_URI

2015-12-08 07:39:37 +00:00

ContactsInternal.java

Add work contacts directory support in Quick Contacts API

2015-11-23 13:32:45 +00:00

DocumentsContract.java

Load Home directory by default.

2015-12-14 18:17:16 +00:00

DocumentsProvider.java

Don't copy a directory into itself...doesn't go well.

2015-12-01 14:16:38 -08:00

Downloads.java

…

LiveFolders.java

…

MediaStore.java

Fix documentation issue

2015-08-17 18:45:22 +00:00

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

resolve merge conflicts of 6b9e5bf0c2 to master.

2015-12-18 03:05:20 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

…