Commit 4985b736 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
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 skipped: 645f1d9a skipped: 88d00065 skipped: 7e899dc9 skipped: 78f4fce4

Change-Id: I38750c22ac654ce3b1a3e619d7fc79e37c0519c9
parents b6d7e6b9 78f4fce4
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