Wink Saville 9bb67459b6 Merge commit 'edd57a98' into fix-conflict ...

* commit 'edd57a98':

Conflicts:
	core/java/android/provider/CallLog.java
	telephony/java/android/telephony/TelephonyManager.java

Change-Id: Ia16537ede73f7b2e2c22ca1ff664a32bd6c272fa

2014-09-16 13:23:43 -07:00

..

AlarmClock.java

…

BaseColumns.java

…

Browser.java

Remove WebIconDatabase calls from android.provider.Browser

2014-06-09 17:50:34 -07:00

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

resolved conflicts for merge of 66c16547 to lmp-sprout-dev

2014-09-13 20:10:08 +00:00

Contacts.java

API changes per API review for contacts

2014-06-04 18:16:26 -07:00

ContactsContract.java

ContactsContract API changes per API review

2014-09-04 16:51:53 -07:00

DocumentsContract.java

Define EXTRA_SIZE for ContentProviders.

2014-08-27 15:13:57 -07:00

DocumentsProvider.java

resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp

2014-09-08 13:08:43 -07:00

Downloads.java

…

LiveFolders.java

…

MediaStore.java

Migrate extras to ClipData for image/video capture intents.

2014-07-25 10:22:19 +01:00

OpenableColumns.java

…

package.html

…

SearchIndexableData.java

Add userId as a new field for SearchIndexableData

2014-07-10 16:39:08 +00:00

SearchIndexableResource.java

Fix constructors for SearchIndexableData and SearchIndexableResource

2014-04-11 15:15:34 -07:00

SearchIndexablesContract.java

Update SearchIndexablesContract for adding UserId

2014-07-10 19:22:46 +00:00

SearchIndexablesProvider.java

SearchIndexablesProvider - support for querying for non indexable data keys

2014-04-11 18:45:44 -07:00

SearchRecentSuggestions.java

…

Settings.java

Merge "Allow device owners to update LOCATION_MODE." into lmp-dev

2014-09-11 15:46:07 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add TRANSCRIPTION column to Calls table

2014-07-14 10:05:31 -07:00