Skip to content
Commit 1327cdc5 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev

parents edda7ebd 8558ec7d
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