Commit 079ebb8c authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

Merge "[automerger skipped] Merge "DO NOT MERGE: DirectBootHostTest on the... 

Merge "[automerger skipped] Merge "DO NOT MERGE: DirectBootHostTest on the device that doesn't support secure lock screen" into nougat-cts-dev am: 27764a59 -s ours am skip reason: subject contains skip directive" into nougat-mr1-cts-dev
parents 6acd335d c5e30c11
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