Jason Simmons f0b82d61f5 resolved conflicts for merge of faa81c82 to ics-aah ...

Change-Id: I7464f16940058cc9b5a3dba5cb839bc67129009e

2011-11-10 14:29:46 -08:00

..

AlarmClock.java

…

Applications.java

…

BaseColumns.java

…

Browser.java

…

BrowserContract.java

Add ROOT_ID to Accounts column

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

CalendarContract.java

b/5309787 Add new columns to hidden list of read only fields

2011-10-27 14:11:44 -07:00

CallLog.java

Add a cached formatted phone number to call log.

2011-10-01 18:55:33 +01:00

Contacts.java

…

ContactsContract.java

Unhide social stream APIs for Contacts.

2011-11-07 17:06:54 -08:00

Downloads.java

Notify policy listeners about metered ifaces.

2011-06-17 16:49:21 -07:00

DrmStore.java

…

LiveFolders.java

Fix issue #4554429: API REVIEW: deprecate Live Folders

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

MediaStore.java

Fix 5224359: Add width and height to media store.

2011-09-20 20:41:44 +08:00

OpenableColumns.java

…

package.html

…

SearchRecentSuggestions.java

…

Settings.java

resolved conflicts for merge of faa81c82 to ics-aah

2011-11-10 14:29:46 -08:00

SocialContract.java

…

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

Telephony.java

Revert "Add new secure setting for controlling Messaging notifications"

2011-11-10 11:17:38 -08:00

UserDictionary.java

…

VoicemailContract.java

Added FETCH_VOICEMAIL intent definition in VoicemailContract.

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