Commit 841d5044 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

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

[automerger skipped] 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 skipped: 50b33fa6

Change-Id: I786b68abffe0f33ee57069f9dbeff8e7d99b71ab
parents a7c4d9c2 50b33fa6
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