| commit | dba631e43b93dcefd76e09b91244b7559f23c261 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 08 15:57:20 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:57:20 2012 -0800 |
| tree | 43fc907a37d904a48a94b0ffae6db080ac95a6da | |
| parent | e85f7bb1339efbd81f6cf7143090c6b3d11f1853 [diff] | |
| parent | 87d6e4be882a570144d98e43c4487e7900dbb839 [diff] |
am 87d6e4be: am 426348ae: am e9c881c6: am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev * commit '87d6e4be882a570144d98e43c4487e7900dbb839': Don't handle click events on the emergency button in bouncer mode