Commit 7cd243c7 authored by Paul Crowley's avatar Paul Crowley Committed by android-build-merger
Browse files

[automerger skipped] Merge "Revert "testEncryption for device without secure... 

[automerger skipped] Merge "Revert "testEncryption for device without secure lock screen"" into nougat-cts-dev
am: 6c01bccd -s ours
am skip reason: SHA1 6c01bccd skipped by user paulcrowley

Change-Id: Icd4943ec2ff6c4d3fd919584c833a75b81d1162a
parents 645f1d9a 6c01bccd
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment