Junda Liu 829519dfaa Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev automerge: 2eb5a5f ...

automerge: 5716ebe

* commit '5716ebe50debab01ede01b2f99abde85a250c82c':
  Add HIDE_CARRIER_NETWORK_SETTINGS global setting.

2014-11-12 03:12:51 +00: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

Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37

2014-10-28 11:19:14 -07:00

Contacts.java

…

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

Put in real "code" (aka marketing) name.

2014-10-07 20:17:19 -07: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

…

SearchIndexablesContract.java

Update SearchIndexablesContract for adding UserId

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

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev

2014-11-12 00:05:20 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

Add TRANSCRIPTION column to Calls table

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