Commit e0a2ff6c authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
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 skip reason: subject contains skip directive" into nougat-mr1-cts-dev
parents d606a812 5d7c3056
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