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

Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-dev

parents c12dd973 ee82f8fa
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