commit | 57f068ad1ac9731b20aea3a5e7a0fccd3ef4ee51 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 22:41:22 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 22:41:22 2020 +0000 |
tree | c4a7d03d044f6c95bcb19780adda0bf3d57ed7b6 | |
parent | d70e690d31d4ac0ad21ee495a0e69f2f5a40cf16 [diff] | |
parent | 285ec06847714e305789ee9394823f1c38f02c62 [diff] |
[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: 285ec06847 -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: I85592105f1d2bdb958c86198dc871e299d200982