Dirk Dougherty e61cad321d resolved conflicts for merge of 532679a5 to master ...

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b

2012-03-07 16:58:03 -08: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

CalendarContract.java

Add a displayColor column to view_events

2012-03-02 09:43:17 -08:00

CallLog.java

Add a cached formatted phone number to call log.

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

Contacts.java

…

ContactsContract.java

Merge "Introduce Callable URI as hidden API"

2011-11-18 14:02:28 -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 incorrect javadoc

2012-03-02 16:36:32 -08: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 532679a5 to master

2012-03-07 16:58:03 -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 support for CMAS warning notifications over CDMA." I'll submit again when the app change is ready.

2012-02-29 14:00:12 -08: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