John Spurlock cf2d725b55 resolved conflicts for merge of f1dd32c8 to master ...

Change-Id: Ied96bfce952fa95eeceb1b8cf64e53830d4d03ac

2013-10-14 14:49:58 -04:00

..

AlarmClock.java

Merge "Add ACTION_SHOW_ALARMS to Clock API" into klp-dev

2013-08-29 17:52:32 +00:00

BaseColumns.java

…

Browser.java

…

BrowserContract.java

The new APIs for the bookmarks, history and images.

2012-04-12 16:28:46 -07:00

CalendarContract.java

Make more calendar alarms exact

2013-07-18 17:41:32 -07:00

CallLog.java

Update javadocs for number presentation

2013-09-10 15:34:34 -07:00

Contacts.java

…

ContactsContract.java

Add DEMOTED and UNDEMOTE TO ContactsContract

2013-08-05 13:08:55 -07:00

DocumentsContract.java

Support overriding calling package in Documents.

2013-10-09 13:52:26 -07:00

DocumentsProvider.java

Require that persistable Uri permissions be taken.

2013-09-25 15:16:41 -07:00

Downloads.java

Allow saving to Downloads.

2013-09-23 14:23:45 -07:00

LiveFolders.java

…

MediaStore.java

Docs change: annotate media intent actions.

2013-10-02 10:11:25 -07:00

OpenableColumns.java

Start fleshing out new storage APIs.

2013-05-01 17:21:06 -07:00

package.html

…

SearchRecentSuggestions.java

…

Settings.java

resolved conflicts for merge of f1dd32c8 to master

2013-10-14 14:49:58 -04:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

…