tree 791ea0a396b24aaecf921a71e56e91db1f0c8864
parent bf0c6e85b6ca6a11e225b42579d887c9654620c0
parent 550562380967b2c4f4c720355a52d55a1387ea5e
author Xin Li <delphij@google.com> 1660692883 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660692883 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 3d2998299e -s ours am: f4330e3027 -s ours am: 5505623809 -s ours

am skip reason: Merged-In Id356afa8bbf31df9e049c849b9e12974311909d4 with SHA-1 120f4e639b is already in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/2184751

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