Commit 88d00065 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

Change-Id: Id4af9382ce737d3c5d4c3df629d55572a4c5a5ca
parents 93db9c77 645f1d9a
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