Elliott Hughes d9e6101862 am 05678e17: resolved conflicts for merge of 3ce4f3d0 to master ...

* commit '05678e17e8c079a1c1c144e23e40a7a644a0b040':
  Track libcore.os' move to android.system.

2014-04-28 21:22:01 +00: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

Fix SDK build break due to link in hidden field in comment

2013-12-12 17:29:03 -08:00

Contacts.java

Remove unused imports from frameworks/base.

2013-11-20 11:31:47 -05:00

ContactsContract.java

Add IN_DEFAULT_DIRECTORY to contract

2014-03-04 17:41:13 -08:00

DocumentsContract.java

resolved conflicts for merge of 3ce4f3d0 to master

2014-04-28 13:53:25 -07:00

DocumentsProvider.java

Add directory selection to DocumentsProvider.

2014-04-22 22:18:21 -07:00

Downloads.java

Allow saving to Downloads.

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

LiveFolders.java

…

MediaStore.java

am fa711a33: am d09e1bff: am ed5b8c06: am 6aeea454: Merge "docs: Added the play from search intent. Bug: 13473141." into klp-docs

2014-04-18 02:03:14 +00:00

OpenableColumns.java

Start fleshing out new storage APIs.

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

package.html

…

SearchIndexableData.java

Fix constructors for SearchIndexableData and SearchIndexableResource

2014-04-11 15:15:34 -07:00

SearchIndexableResource.java

Fix constructors for SearchIndexableData and SearchIndexableResource

2014-04-11 15:15:34 -07:00

SearchIndexablesContract.java

SearchIndexablesProvider - support for querying for non indexable data keys

2014-04-11 18:45:44 -07:00

SearchIndexablesProvider.java

SearchIndexablesProvider - support for querying for non indexable data keys

2014-04-11 18:45:44 -07:00

SearchRecentSuggestions.java

docs: Add developer guide cross-references, Project ACRE, round 4

2011-12-22 15:08:23 -08:00

Settings.java

am 143ae9f7: Define action used to show regulatory info.

2014-04-28 16:41:48 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

TvContract.java

Add a contract class for the TV content provider

2014-04-09 11:42:40 -07:00

UserDictionary.java

Add methods to support shortcuts in user dict.

2012-01-18 18:54:34 +09:00

VoicemailContract.java

…