tree 223f30f34226c680f11bf47c351503c326d1d535
parent 1f9743dcd72f36e5dc45f5f68ef77507d260b6bc
parent bec9f45b63111d5cd7fde1bb41542d309d6b80ee
author John Spurlock <jspurlock@google.com> 1411696090 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411696090 +0000

am cfc1a5ee: Merge "Shorten the zen supertoast visible duration." into lmp-dev

* commit 'cfc1a5eec4bb331e22f0492c1a9b7a7f898b8960':
  Shorten the zen supertoast visible duration.