Skip to content
Commit 96a91f11 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"...

Merge "Don't resume activity if user is locked and encryption is unsupported" into oc-mr1-dev am: 1327cdc5
am: 004f9a30

Change-Id: Ifcbb0d3fbde8f87052509d5ef0a0b57e013e2245
parents 8ee6ecc1 004f9a30
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment