Commit c5e30c11 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: I6e989c32b7c60fc28a41542c525230e325404661
parents 6acd335d 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