tree 80641c5a501175c0baa9522a74f46aa3fd43d64f
parent 611c3cc6fcdd3c4743e9a2dac4616cd40fb22f70
parent 3f4723dce080b20200a935a4cef1ec4824ed8434
author josephjang <josephjang@google.com> 1593197087 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593197087 +0000

Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge-upstream am: 3f4723dce0

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

Change-Id: I509cecd229deeca7126ca097085e40f6f4589893