tree 4354e9890cf67fa6d36f4c5529eca4b1206ccb95
parent 832b40b6686ff19072f111ffcb6f57beb731abe4
parent 997fb5c652bd0378d61689ada4a7ae95127bb91e
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670637598 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670637598 +0000

Merge "[automerger skipped] Merge Android 13 QPR1 am: ffc2592f4f -s ours" into stage-aosp-master am: 997fb5c652 -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: I51323dc6decf9e25e7df8a766b93f4aa67d21655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>