tree 05a76bc9b0a7ed164e19505e457532a5bdda2b56
parent 65eb202f3740331104c1efde4514ea9b0441fe94
parent 39b5b161c28558dc8ca0fcc1a2cadf179c960698
author Xin Li <delphij@google.com> 1656540798 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656540798 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 39b5b161c2 -s ours

am skip reason: Merged-In I6e004b0116d3aee491da553b178c33af0cba2ac6 with SHA-1 b12e160546 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/19094890

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