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

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

Merge "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: 84a1c051 -s ours
am skip reason: subject contains skip directive

Change-Id: I283a2dff32b6500e0979f4c03951ff7014309983
parents 9a7eb00a 84a1c051
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