Commit 6d7f450a 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 s skipped: e3266e9f

Change-Id: If97357f9088199573b243950a536bb651c9d8545
parents 0edae38f e3266e9f
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