merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Show newer/older text in toast upon long-press

Bug: 7466983
Change-Id: I4b4f0e992c965538e0a9c610c8f5f185aa2ad77c
Show newer/older text in toast upon long-press

Fixed copy paste mistake

Bug: 7466983
Change-Id: I83abae506c44c894daf909b4c91f7704ccf9537e
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I95d95cc75ec209cef80f5d5e451f7a08a8347c30
am 8c7f8d74: Enable Email lockscreen widget

* commit '8c7f8d747c9d9c6267c72285c24db66cdb856bad':
  Enable Email lockscreen widget
Reconcile with jb-mr1-release - do not merge

Change-Id: I3d9459f0529e85ebdb2e3ce3f2455feda7367463
am acd8e786: Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13

* commit 'acd8e7868b8ee3e1811fcf9bfdc4a9fbfab0cd0d':
  Revert "Enable Email lockscreen widget" https://b.corp.google.com/issue?id=7488437#ISSUE_HistoryHeader13
Reconcile with jb-mr1-release - do not merge

Change-Id: I357bd74851961df90c28ed471b6bf37efc765a4f
Enable Email Widget on lockscreen. Work around keyguard detection issues.

Bug: 7488437
Change-Id: Id1eee0d295358a64ad5b6f31258acd66ec899165
am 5c5d3c64: Add content description to Compose button in Widget.

* commit '5c5d3c64be716ff7bf98125f9025641c09580663':
  Add content description to Compose button in Widget.
Reconcile with jb-mr1-release - do not merge

Change-Id: Ifba742d6ead562601f4e93d1d526b5efe396066f
Import translations. DO NOT MERGE

Change-Id: Ia1bdf6d0dcd916a29ea20fd3c4bdba8485d18f27
Auto-generated-cl: translation import
Email Widget will use startActivity instead of startService so that it works
correctly from the keyguard.

Reverts the workaround in
https://googleplex-android-review.googlesource.com/#/c/250126/

Bug: 7545250
Change-Id: Idf9305b0e74e56c13bdcde5548db20f08b20bae2
Fix build caused by
https://googleplex-android-review.googlesource.com/#/c/252374/

Bug: 7545250
Change-Id: I4346e1bad7aad4da8d6919cebdf4d48c2c50df08
Import translations. DO NOT MERGE

Change-Id: I61ce29f8e3283a6c186d470dad7cfc3041e564e4
Auto-generated-cl: translation import
Fix Email Widget crash.

Bug: 7561432
Change-Id: I8dd0ad8c91f0b27e3ef856c39dc6d76b2017c156
Import translations. DO NOT MERGE

Change-Id: I42c40c652dc84fee5269e385b2a8801292e5aa1a
Auto-generated-cl: translation import
Do not vibrate in vibrate mode if ringtone is silent

An empty string as the ringtone URI was triggering the system
vibration while in vibrate mode.

Bug: 7624838
Change-Id: Ide1cb2d8ac5d1295c18770bd053dd1cd0a50feb0
Specify a timeout for the connection handshake

Email hadn't been setting a timeout on the connection handshake, so
this could have stalled the thread indefinitely.  We should use the same
timeout that we use for the connection itself.

Bug: 7583420
Change-Id: If8740b7f6c1d5fc18f40f0bb1ec7ed88d7b98af5
Merge "Specify a timeout for the connection handshake" into jb-mr1.1-dev