Commit 21118e53 authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
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-cts-dev am: b29aa1aa -s ours
am: e0a2ff6c -s ours
am skip reason: subject contains skip directive

Change-Id: Ia95b41fe0b373be0418c811a80fcc452fd94befd
parents 42353da5 e0a2ff6c
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