tree c4a7d03d044f6c95bcb19780adda0bf3d57ed7b6
parent cb5365cb93ee8f009f12826cf1c630face36e03a
parent a70c4b653c21cb1c6a119a0a2c3ec5066cc9a8a1
author Xin Li <delphij@google.com> 1599859643 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859643 +0000

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