tree 32ab9ea9264135ec9f89e54e41a6bea9e8717ba2
parent fa3410f5cd0880acd445339aebdcf0fe72564914
parent 84bdf394358deaf7c2e2993abce6f3885507edf5
author Xin Li <delphij@google.com> 1633683562 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683562 +0000

[automerger skipped] Merge Android 12 am: 2ac2cae4ed -s ours am: cf8130b3c3 -s ours am: 22d4450bcf -s ours am: 1295c157af -s ours am: 84bdf39435 -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: Ib1f286886429f857b834d253dc581e07f4f1e5d9