commit | a0d4e807a527f622abdc63383915e7864046ec75 | [log] [tgz] |
---|---|---|
author | Charlie Boutier <charliebout@google.com> | Wed Aug 09 01:38:24 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 09 01:38:24 2023 +0000 |
tree | bcebfbe15f19b044a090f923ab9fdb6a1a3e251f | |
parent | 12923249ec1e0893e48cc98e5984add090d3f373 [diff] | |
parent | 92e20e2c6410c78a097edb89c72b50b74060d861 [diff] |
Merge remote-tracking branch 'aosp/upstream-main' into aosp/main am: 92e20e2c64 Original change: https://android-review.googlesource.com/c/platform/external/pandora/avatar/+/2699933 Change-Id: Ibc3976c9963bef52a86e17ecbcc36e3580b32ef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>