Skip to content
Commit 8e5585bb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix test failure in MixedDeviceOwnerTest#testSecondaryLockscreen." into... 

Merge "Fix test failure in MixedDeviceOwnerTest#testSecondaryLockscreen." into sc-dev am: 2d0acc61

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474171

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9e0f329cf3a0fe1a07d22f33ee3ce2578e4d77e
parents aebf1561 2d0acc61
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment