tree c4a7d03d044f6c95bcb19780adda0bf3d57ed7b6
parent 58f1f69a0ed6978af5e93eaa76af24dcca17772f
parent ed44f0cbef36c1e6067d31d80b4372ad951b03e5
author Xin Li <delphij@google.com> 1599784795 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784795 +0000

[automerger skipped] Merge Android R am: ed44f0cbef -s ours

am skip reason: Change-Id Idbf8064b452046180970762ee90d6539336fd54a with SHA-1 58f1f69a0e is in history

Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/arvo/+/1422368

Change-Id: I18c998cf63cfd1ada1051f881a71e3d9e0aac1f0