tree 32ab9ea9264135ec9f89e54e41a6bea9e8717ba2
parent 0197707dce8edf0aba650087b3247c202603bd7d
parent 1295c157af3f4e636a56e42ddf2df8df89524c54
author Xin Li <delphij@google.com> 1633681751 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681751 +0000

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