tree b9a6128054928f635235db97d534324311d4b4f3
parent c19b54975214a12225a1669ae18b0005a1357189
parent 9e6575bc52f421484fe262aff224db247e70d830
author Dianne Hackborn <hackbod@google.com> 1357930399 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357930399 -0800

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

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