tree 5cf831cca8746abd1d8c80491f4ef41ac309b172
parent 49dea0e6ae93f5ae9c2d11702d93e1414812e558
parent 3358d824f3e9616656f9e737dbb7da62f41e3e8d
author Xin Li <delphij@google.com> 1651697814 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1651697814 +0000

[automerger skipped] Merge SP2A.220505.002 am: 3358d824f3 -s ours

am skip reason: Merged-In Ic2ed06886679671a04a35f86665cb147b8103905 with SHA-1 2f02dcb4ff is already in history

Original change: https://android-review.googlesource.com/c/device/google/bonito/+/2085708

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