tree 968c37bf08f0111566e09ce2087cfe3e65578f13
parent ed555c308fd4eaaac3448805edc191d7c48ffff5
parent 5f7fefa919ba9593ff9bea9b683b709352bc0305
author Xin Li <delphij@google.com> 1656547374 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547374 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 13009fe1e3 -s ours am: fafd4a6d67 -s ours am: 5f7fefa919 -s ours

am skip reason: Merged-In I926d520cec73ac54f4c9da75d9dcc67f2edc7db1 with SHA-1 e862bdd306 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/sample/+/19094403

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