| commit | 426348ae8158f84c034310e08602362bd1a02072 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 08 13:12:35 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 13:12:35 2012 -0800 |
| tree | bfff950383ca361b2beaf34ad190da2d715a1932 | |
| parent | e8d02b315b4b8f76e53edb194591b6b46175ffe4 [diff] | |
| parent | e9c881c66d7845dabb936e93939179ff87f72699 [diff] |
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