Andre Eisenbach 1cba33abf3 resolve merge conflicts of e6c7c8e8f2 to cw-e-dev ...

am: dfd4b8b25c

* commit 'dfd4b8b25c6454dec6d1bdc7cae4976b537fff2f':
  DO NOT MERGE Read Bluetooth interop database entries from settings (1/2)

2016-02-24 19:57:07 +00:00

..

AlarmClock.java

Fix build: documentation error in AlarmClock.java.

2015-06-04 19:51:52 -07:00

BaseColumns.java

…

Browser.java

Remove bookmarks provider and associated permissions - framework

2015-06-11 18:59:25 -07:00

BrowserContract.java

…

CalendarContract.java

Fix calendar reminder notification is not shown in idle state

2015-07-03 15:49:16 +00:00

CallLog.java

Mark missed calls as read in calllog restore(2/2)

2015-08-04 14:10:49 -07:00

Contacts.java

Ubundle from contacts contract Part 1/3

2015-01-09 01:07:45 +00:00

ContactsContract.java

Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."

2015-07-16 21:19:28 +00:00

ContactsInternal.java

Enterprise quick contact 1/2

2015-03-30 16:28:39 -07:00

DocumentsContract.java

Relax auto-launch checks for GET_CONTENT.

2015-09-29 13:04:48 -07:00

DocumentsProvider.java

Also check app-ops on path-permissions.

2015-07-24 15:16:11 -07:00

Downloads.java

…

LiveFolders.java

…

MediaStore.java

Fix documentation issue

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

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

Make Settings search API as a SystemAPI

2015-03-30 12:32:09 -07:00

SearchIndexableResource.java

Make Settings search API as a SystemAPI

2015-03-30 12:32:09 -07:00

SearchIndexablesContract.java

Fix build.

2015-03-30 15:46:30 -07:00

SearchIndexablesProvider.java

Make Settings search API as a SystemAPI

2015-03-30 12:32:09 -07:00

SearchRecentSuggestions.java

…

Settings.java

resolve merge conflicts of e6c7c8e8f2 to cw-e-dev

2016-02-24 19:57:07 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add transcription field to voicemail object and related changes.

2015-07-16 18:36:58 -07:00