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

Merge "Fix Camera and GoogleNow launching in keyguard" into jb-mr1-dev

parents b07e89f6 5f75aa15
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