tree 0ca137d684cd169361974de6aac441dfa4b57500
parent 9109bb5d4593c461232ea31496afd1b915e6a448
parent a1c2841380d4c9a0cfeede01918eaea6ff0e498e
author josephjang <josephjang@google.com> 1594123994 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594123994 +0000

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

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

Change-Id: I454e5fc308d57606c726f6e8e9a0ef3475eaf486