Commit 645f1d9a authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
Browse files

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

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

Change-Id: I41008c64e0f5562c4b1f85f1793e4f53a69edde4
parents 76afdfae a138b9c5
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