| commit | 87d6e4be882a570144d98e43c4487e7900dbb839 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 08 15:46:18 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:46:18 2012 -0800 |
| tree | f676ef9d2e92e5df3eb893fc8b2e471801af7eca | |
| parent | 5a65073e5cb0f2955817fa6cfeaf2514eb8c7813 [diff] | |
| parent | 426348ae8158f84c034310e08602362bd1a02072 [diff] |
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 '426348ae8158f84c034310e08602362bd1a02072': Don't handle click events on the emergency button in bouncer mode