Commit 50ead267 authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
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: c5ff36a5 -s ours
am skip reason: subject contains skip directive

Change-Id: Iac04fdb647a5d7f41074d51ca24b2976cd5f16f1
parents ec7143be c5ff36a5
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