Jorim Jaggi 00cd47a2d2 resolved conflicts for 0fb3f695 to master. ...

Change-Id: I679920313a872f8eb81cf00ffb6ffe037b8d0a3a

2015-09-09 18:40:05 -07:00

..

AlarmClock.java

…

BaseColumns.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

…

Contacts.java

…

ContactsContract.java

…

ContactsInternal.java

…

DocumentsContract.java

…

DocumentsProvider.java

…

Downloads.java

…

LiveFolders.java

…

MediaStore.java

…

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

resolved conflicts for 0fb3f695 to master.

2015-09-09 18:40:05 -07:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

…