tree fd63c4b0960a8bc6fddc472b24459adf8bb0178d
parent 17a0826e5de70657279f4564c4ed6de819cb3768
parent 97a2be8672febec536641fb37f4900e4402035b0
author John Spurlock <jspurlock@google.com> 1418357530 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418357530 +0000

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

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