Commit 94d26a4e authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
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 skipped: 7cd243c7

Change-Id: I3f8d1bd35b293219c31771c5703337eb754ec517
parents 88d00065 7cd243c7
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