tree ef9bdbe73c2b30c84bd518d38eefe33e528ab00d
parent 6be5d827f60c70ee501eae149c57c7aa57be04bf
parent 2a11302d90039ba7f408924cd0fb2a94ede63061
author Xin Li <delphij@google.com> 1599001301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599001301 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 33faa2ac3e -s ours am: dce679f709 -s ours am: 2a11302d90 -s ours

am skip reason: Change-Id Ia6f397db17f229eee50939705459e0409fdebbbe with SHA-1 3375767a91 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/big-shoulders-text/+/12470070

Change-Id: Ifa8ea25f4723301daa69723cec864b3e1eb6a5c2