tree 6b551369904945a10e8d9051c38f3c37cc4b486a
parent d3aeae9da0737e9a6d39d0740146b96cf344f326
parent 1af87746048db0a63bdc2c557f513d72a2c7a809
author Vincent Wang <firewall@google.com> 1703664608 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1703664608 +0000

[automerger skipped] Merge "[DO NOT MERGE] Fix biometric test flaky" into udc-dev am: cf57381227 am: b62aec1778 am: 98fc1cb42c am: 1af8774604 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4517fac061270e6eb77349ec3dce3b17c598afc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>