tree aaadb7123205ac89aec1bfe57dcf799e37ede135
parent d1aa67b8e19ae96bd2ae4e6719d13902a8b6d845
parent 6f9a71729f6ba7521ed8461ec8b556a8907743b1
author John Spurlock <jspurlock@google.com> 1418357080 +0000
committer android-build-merger <android-build-merger@google.com> 1418357080 +0000

am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev
automerge: 6f9a717

* commit '6f9a71729f6ba7521ed8461ec8b556a8907743b1':
  Zen: Leave zen=none on manual ringer mode stream volume changes.