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

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

Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev am: b29aa1aa -s ours am: e0a2ff6c -s ours am skip reason: subject contains skip directive" into oreo-cts-dev
parents 42353da5 21118e53
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