Commit 5d7c3056 authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
Browse files

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

[automerger skipped] Merge "RESTRICT AUTOMERGE: testEncryption for device without secure lock screen" into nougat-cts-dev
am: b29aa1aa -s ours
am skip reason: subject contains skip directive

Change-Id: Ie51a891c4f124f71ce408bebf1e69c2063281fac
parents d606a812 b29aa1aa
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