Jeff Davidson 1eb5ca609a am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183 ...

automerge: 38e8763

* commit '38e8763df55ebedcf65178f8acced806113af4a5':
  Add global setting for ephemeral network timeout.

2014-12-17 21:05:53 +00:00

..

AlarmClock.java

…

BaseColumns.java

…

Browser.java

…

BrowserContract.java

…

CalendarContract.java

…

CallLog.java

Additional changes to SubscriptionManager API as per API council.

2014-11-22 10:08:16 -08:00

Contacts.java

…

ContactsContract.java

ContactsContract API changes per API review

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

DocumentsContract.java

…

DocumentsProvider.java

am 42fec57f: am d9968438: Merge "Fix issue with call backs from media process." into lmp-mr1-dev

2014-11-21 00:43:51 +00: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

…

SearchIndexableResource.java

…

SearchIndexablesContract.java

…

SearchIndexablesProvider.java

…

SearchRecentSuggestions.java

…

Settings.java

am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f183

2014-12-17 21:05:53 +00:00

SyncConstValue.java

…

SyncStateContract.java

…

UserDictionary.java

…

VoicemailContract.java

…