Commit 42353da5 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

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

Merge "[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" into oreo-cts-dev
parents 66c7c121 33da5f88
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