Commit 33da5f88 authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
Browse files

[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device... 

[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-mr1-cts-dev
am: d606a812 -s ours
am skip reason: subject contains skip directive

Change-Id: I8c412f373420eaf8554019ca082e2efe962858b8
parents 66c7c121 d606a812
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