tree c221ae1f7f3fe87b64b8dfc3bb397f1a71cc5de8
parent d17792073fd3ab963bd5e0a7edcb312720fcea26
parent 0287ca3ca36ad98004ddabfa189105e6324a820e
author Dianne Hackborn <hackbod@google.com> 1357786806 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357786806 -0800

am 0287ca3c: am e62fa825: Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog

* commit '0287ca3ca36ad98004ddabfa189105e6324a820e':
  Merge from master: fix issue #7966357: Super lights out mode vs. volume dialog