Skip to content
Commit ae0161e7 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Don't handle click events on the emergency button in bouncer mode" into... 

Merge "Don't handle click events on the emergency button in bouncer mode" into jb-mr1-lockscreen-dev
parents 71b7d891 8bbafed4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment