Jean-Baptiste Queru 99a518ffab resolved conflicts for merge of ca48433a to master ...

Change-Id: I0dd2dee65ff72b7eae20019c6232b66388fe7990

2010-07-20 10:40:17 -07:00

..

Applications.java

…

BaseColumns.java

…

Browser.java

Add a bulk request method for bookmark icons.

2010-04-12 14:26:13 -04:00

Calendar.java

Added support for full-text search in Calendar

2010-07-19 15:28:23 -07:00

CallLog.java

…

Contacts.java

…

ContactsContract.java

Replace try-catch code by proper type checking. Saves an exception for each blob.

2010-07-19 18:01:28 -07:00

Downloads.java

Interface support for custom HTTP headers in DL manager

2010-07-15 10:22:50 -07:00

DrmStore.java

…

LiveFolders.java

…

MediaStore.java

Add MTP_OBJECT_ID column name to MediaStore.MediaColumns

2010-07-19 09:51:56 -04:00

Mtp.java

MTP: Add interface to MtpClient for receiving device added/removed events.

2010-06-12 21:35:27 -04:00

OpenableColumns.java

…

package.html

…

SearchRecentSuggestions.java

…

Settings.java

Recover a handful of commits that were reverted earlier

2010-06-21 13:46:59 -07:00

SocialContract.java

…

SyncConstValue.java

…

SyncStateContract.java

…

Telephony.java

Replaced /sdcard with Environment.getExternalStorageDirectory()

2010-07-19 15:54:40 -07:00

UserDictionary.java

…