tree e2ca3f43ecf503188781a45d2817d0c82ef64349
parent e3a724e1914d1dd577b5311c963a71873a2ed643
parent 1e57a1ef0d24f50606374db023be210b2f95186a
author Xin Li <delphij@google.com> 1660698212 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660698212 +0000

DO NOT MERGE - Merge Android 13 am: a96756d4c2 am: 03675bcee8 am: 1e57a1ef0d

Original change: https://android-review.googlesource.com/c/platform/external/nos/host/generic/+/2186760

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