tree 6f7e5b673d3ca9bfa6454d37a00d3d7ea43e51a4
parent ac2b02386aafecf9a0877c6a9c457200c3f8faa7
parent eac4be7ef28a9dfba9e6cc6d0501b4bd2146041a
author Jim Miller <jaggies@google.com> 1354686824 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354686824 -0800

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

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