tree 4354e9890cf67fa6d36f4c5529eca4b1206ccb95
parent 75628b7ddc2a51289fd865f0ea716d401042f38b
parent ffc2592f4fe664acc26a0663636311477b5e0a3b
author Xin Li <delphij@google.com> 1670627680 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670627680 +0000

[automerger skipped] Merge Android 13 QPR1 am: ffc2592f4f -s ours

am skip reason: Merged-In If4cf0f0e773371430539cde914bcc761b26acf7e with SHA-1 35a6ffe9a6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/minikin/+/2338212

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