Commit e3266e9f 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 skipped: 94d26a4e skipped: fbbd41ce skipped: 28a261c2

Change-Id: I1d490f2f29c786abbe6abd29c2ccfc4fd9fd9bb5
parents 4985b736 28a261c2
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