tree 0ffccbf9133f3ab06b170410d2e90c968f329784
parent abf49c19e1ba36f87b9cb9a415f9b91a5af4ddf8
parent 0b35b9a8f9802a3a17bd7dc6d073e4433aa8d771
author Xin Li <delphij@google.com> 1598914305 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598914305 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 674b7fc072 -s ours am: 26aec65650 -s ours am: 0b35b9a8f9 -s ours

am skip reason: Change-Id I5936c387c7ec838981a31cb62923dcee81d68fe2 with SHA-1 ad4b880345 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/source-sans-pro/+/12470164

Change-Id: I7d8ccb401398428634b00d8c262fe9a5aa2ac593