Skip to content
Commit 004f9a30 authored by Bryce Lee's avatar Bryce Lee Committed by android-build-merger
Browse files

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

am: 1327cdc5

Change-Id: I18e0a89f4afcdaa61da289566c275a29dadc9c28
parents 4558b89c 1327cdc5
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