tree af23daeb50de8b8f685b932302eb13bf51ec152c
parent 5cb09b7dc5b2a3bfa895bca5402af9edc8ec9d9a
parent 4fa27f314038620fd3c50170d2f8caebeb6005bb
author Jim Miller <jaggies@google.com> 1354653229 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354653229 -0800

am 4fa27f31: am 80a90efc: Merge "Fix ring volume issue by addressing focus regression in keyguard." into jb-mr1.1-dev

* commit '4fa27f314038620fd3c50170d2f8caebeb6005bb':
  Fix ring volume issue by addressing focus regression in keyguard.