Jim Miller 3569e9e50c resolved conflicts for merge of 2f6a2526 to master ...

Change-Id: Ie51d3a63f4d4d5bad7ef16ad84ef6ad5acdaa64a

2013-04-17 14:18:56 -07:00

..

AlarmClock.java

…

Applications.java

Removed launch count increase API from Applications.

2011-02-25 12:37:33 +00:00

BaseColumns.java

…

Browser.java

Comment clean up.

2011-02-25 10:53:50 -05:00

BrowserContract.java

The new APIs for the bookmarks, history and images.

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

CalendarContract.java

am 9d936591: am f5726617: am 2144eee3: am 3fb5536d: am 91e01a4d: Merge "Doc update: fix broken code sample" into jb-mr1.1-docs

2013-04-03 14:30:09 -07:00

CallLog.java

Adding limit and offset query parameters to CallLog.

2012-08-03 15:19:37 -07:00

Contacts.java

Fix obvious typos under frameworks/base/core

2012-03-09 22:48:43 +09:00

ContactsContract.java

Adding public api support for finding contact changes.

2013-04-09 14:12:31 -07:00

Downloads.java

Define failed connections column, and reset.

2013-01-17 17:27:33 -08:00

DrmStore.java

…

LiveFolders.java

Fix issue #4554429: API REVIEW: deprecate Live Folders

2011-09-01 19:58:00 -07:00

MediaStore.java

MediaStore.Audio.Media.getContentUriForPath() returns unexpected content

2013-02-08 16:17:23 +00:00

OpenableColumns.java

…

package.html

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00

SearchRecentSuggestions.java

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

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

Settings.java

resolved conflicts for merge of 2f6a2526 to master

2013-04-17 14:18:56 -07:00

SyncConstValue.java

Fixing various broken javadoc comments in framework.

2011-06-24 18:29:41 -07:00

SyncStateContract.java

NPE check in the SyncStateContract

2011-09-08 13:29:15 -07:00

UserDictionary.java

Add methods to support shortcuts in user dict.

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

VoicemailContract.java

Added FETCH_VOICEMAIL intent definition in VoicemailContract.

2011-08-11 18:07:25 +01:00