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

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b

2012-03-07 16:58:03 -08:00

..

AlarmClock.java

…

Applications.java

…

BaseColumns.java

…

Browser.java

…

BrowserContract.java

…

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

…

DrmStore.java

…

LiveFolders.java

…

MediaStore.java

Fix incorrect javadoc

2012-03-02 16:36:32 -08:00

OpenableColumns.java

…

package.html

…

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

…

SyncStateContract.java

…

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

…