OSDN Git Service

am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button...
authorJim Miller <jaggies@google.com>
Thu, 8 Nov 2012 21:12:35 +0000 (13:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 21:12:35 +0000 (13:12 -0800)
commit426348ae8158f84c034310e08602362bd1a02072
treebfff950383ca361b2beaf34ad190da2d715a1932
parente8d02b315b4b8f76e53edb194591b6b46175ffe4
parente9c881c66d7845dabb936e93939179ff87f72699
am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev

* commit 'e9c881c66d7845dabb936e93939179ff87f72699':
  Don't handle click events on the emergency button in bouncer mode