Commit 50b33fa6 authored by Ryohei Takeuchi's avatar Ryohei Takeuchi Committed by android-build-merger
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: 079ebb8c -s ours
am skip reason: subject contains skip directive

Change-Id: I29f395b1a87604d935298f3ec7d99c2674bbbfe9
parents 87a2e04c 079ebb8c
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