tree f7819440046e4556adeb2aa7070035cb19c2b962
parent 23f205c9773ddad240cb1539a08b84ce2706c564
parent cbd222f2ac2c911c2f94302c528bbad0407210bf
author Xin Li <delphij@google.com> 1633657148 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657148 +0000

[automerger skipped] Merge Android 12 am: 73d54361a1 -s ours am: cbd222f2ac -s ours

am skip reason: Merged-In I44395460a9d0d4c42e675be2439b39bc80c82caf with SHA-1 6065241f06 is already in history

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

Change-Id: I748c0f07928357d672e0901ace1c2c6edb8cfae7