tree c4a7d03d044f6c95bcb19780adda0bf3d57ed7b6
parent 32a1d9059830664577f0aec52acf3203d1259c33
parent 93349d14259aa01a08582d3a7e84a8be2a42b987
author Xin Li <delphij@google.com> 1599789752 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789752 +0000

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