| commit | e9c881c66d7845dabb936e93939179ff87f72699 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Nov 08 13:07:59 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 13:07:59 2012 -0800 |
| tree | 5789a44721b0ab6445d5506b8485f6d69e009782 | |
| parent | 1323fe3ed4768237992f0f48a7259e0801d5b4d6 [diff] | |
| parent | ae0161e7af280a35e975dc26457ab4f704d37d0a [diff] |
am ae0161e7: Merge "Don\'t handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev * commit 'ae0161e7af280a35e975dc26457ab4f704d37d0a': Don't handle click events on the emergency button in bouncer mode