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

…

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

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

…

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

…

MediaStore.java

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

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

OpenableColumns.java

…

package.html

…

SearchRecentSuggestions.java

…

Settings.java

resolved conflicts for merge of 2f6a2526 to master

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

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

…