Commit 5ddadf28 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

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

[automerger skipped] 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 skipped: 67dd0f6a

Change-Id: Id998bac3c39fba5dfd4b01ebb629ed2eb09af0a3
parents c4f21c04 67dd0f6a
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