tree 31a509d294940ee53c079e7246e17c5b6c215cfa
parent 71b7d891fc95d360df7a52c7008c92859b9dfdb8
parent 8bbafed48b9c39e3ff5683b7151541c21b3e8ffe
author Jim Miller <jaggies@google.com> 1352346728 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1352346728 -0800

Merge "Don't handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev