Jeff Brown 7218d830e2 resolved conflicts for merge of ca2b552d to master ...

Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b

2011-06-03 15:50:27 -07:00

..

AlarmClock.java

Add EXTRA_SKIP_UI to skip the confirmation page.

2010-12-16 08:04:58 -05:00

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

Add ROOT_ID to Accounts column

2011-05-10 14:07:18 -07:00

Calendar.java

Work on changing syncx to cal_syncx

2011-05-31 13:25:10 -07:00

CallLog.java

Store the current country in call log

2010-08-31 09:59:13 +08:00

Contacts.java

Remove the IM provider contract class.

2009-12-17 13:47:36 -06:00

ContactsContract.java

Add params for primary account to ContactsContract

2011-04-07 08:10:49 -07:00

Downloads.java

bug:3425749 send notification for completed download

2011-02-10 16:54:03 -08:00

DrmStore.java

Fix for the incorrect size of the new added DRM file. (bug 2897238)

2010-09-03 10:45:51 -07:00

LiveFolders.java

Fix documentation.

2009-09-30 13:29:10 -07:00

MediaStore.java

Remove MediaStore.Audio.AudioColumns.ALBUM_ART

2011-05-06 14:55:48 -07:00

OpenableColumns.java

…

package.html

Update package descriptions with editorial revisions.

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

SearchRecentSuggestions.java

Make saveRecentQuery() async.

2010-11-08 16:11:54 -08:00

Settings.java

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

SocialContract.java

Fix missed Aggregate->Contact name change.

2009-07-30 11:46:13 -07:00

SyncConstValue.java

deprecate SyncConstValue, since it is now only used by the deprecated ContactsProvider interface

2010-02-25 16:52:05 -08:00

SyncStateContract.java

add a transaction monitor

2009-09-08 17:25:09 -07:00

Telephony.java

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

UserDictionary.java

…