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

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

[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

Change-Id: I83a8500ba8865929f110faae31a369d38e08925b
parents f163e35d 27764a59
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