tree 32ab9ea9264135ec9f89e54e41a6bea9e8717ba2
parent 33900de2cc0391c56a9b685e7046bdb0648240dc
parent 22d4450bcfa9b1bb59fcd76eee8ceab14f83b02e
author Xin Li <delphij@google.com> 1633679774 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679774 +0000

[automerger skipped] Merge Android 12 am: 2ac2cae4ed -s ours am: cf8130b3c3 -s ours am: 22d4450bcf -s ours

am skip reason: Merged-In I61e1df4c9a673dbdf43a6166d0acd4e2ff15b9c5 with SHA-1 77493a891f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/roboto-fonts/+/1847654

Change-Id: Iddbc3908505a9e9b73f9db14a30ca4ec13b77bbd