Ben Kwa cf1e2f03df resolved conflicts for merge of 3aff4fc6 to master ...

Change-Id: Id816d859f929de3bd0328ef3a67e2bef9fadf28b

2015-06-10 18:22:10 -07:00

..

AlarmClock.java

Fix build: documentation error in AlarmClock.java.

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

BaseColumns.java

…

Browser.java

Add permission annotations to the Browser

2015-04-23 18:49:23 -07:00

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

Do not hide any call log entries when they are added.

2015-03-31 16:58:57 -07:00

Contacts.java

Ubundle from contacts contract Part 1/3

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

ContactsContract.java

un-hide raw_contacts.backup_id and expose metadatasync to system.

2015-06-09 16:50:02 -07:00

ContactsInternal.java

Enterprise quick contact 1/2

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

DocumentsContract.java

Enable apps to exclude their own roots from the DocumentsUI roots list.

2015-06-10 11:24:55 -07:00

DocumentsProvider.java

Annotate methods to be called from overrides with @CallSuper

2015-03-07 20:49:18 -08:00

Downloads.java

…

LiveFolders.java

…

MediaStore.java

Fix API review: Camera prewarm

2015-06-01 18:01:20 -07: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

Add setting for assistant

2015-06-09 14:21:38 -07:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Update docstrings for VoicemailContract to be more descriptive.

2015-05-27 15:54:55 -07:00