Commit 67dd0f6a 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: Id58b184fd9a693f0431e6b133d07dc5970289cec
parents b35ea871 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