tree c4a7d03d044f6c95bcb19780adda0bf3d57ed7b6
parent c83d2abdf215d5dcfae659a1f113559f76ef4fdc
parent 6b272c2ed403598ae564db181e1018b7bb42bbb9
author Xin Li <delphij@google.com> 1599795203 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795203 +0000

[automerger skipped] Merge Android R am: ed44f0cbef -s ours am: 93349d1425 -s ours am: 6b272c2ed4 -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: I33aab33c9bc17d554aa7ca9889ead80fc2808dfc