tree c7566fc6b36b42899f632ad5dfe0843da19031f8
parent e316e84169955bbc6f682532981492f2089d8c11
parent 66d171745cb5f83ea9b2509845a06ce7205d5d8c
author Bill Richardson <wfrichar@google.com> 1632553620 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632553620 +0000

Merge remote-tracking branch 'goog/upstream-master' into MP-SC-07 am: 66d171745c

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

Change-Id: Ib824721d21390e244adaf3b83b0b0de0ee761e2d