Commit ad36f270 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
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 skipped: d04cb821 skipped: 8711ad86 skipped: 2791e778

Change-Id: Id7cf96f2642bfab1fb1ae92fb5280516ba53fb12
parents 1eb5bdf5 2791e778
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