tree 2c976b3235741f2d478469d6746d792b89b0c2d5
parent b05e9a21f4570209efded42f4afb7582312064bc
parent 25d1dfbe6c01f743bdc073490851b38e9729ef63
author Yurii Zubrytskyi <zyy@google.com> 1720722883 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1720722883 +0000

[automerger skipped] Merge "[res] Move the latin parents map to be first" into main am: 25d1dfbe6c -s ours

am skip reason: Merged-In I8aae2a3ced662aceb2965c110168c861dcabb2f0 with SHA-1 8fb681e6c4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3157256

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