tree 5801a3ed38619739c3d555f40f8037ea5b4cd65e
parent 0fd235d7056cf7f92bc2d829d2464814ca7e4302
parent 4e1fe7bd61adfd2a5287f2fbc2a8d0947b6545dc
author Bill Richardson <wfrichar@google.com> 1655703105 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655703105 +0000

Merge remote-tracking branch 'goog/upstream-master' into D2-TM-009 am: 4e1fe7bd61

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

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