tree ef9bdbe73c2b30c84bd518d38eefe33e528ab00d
parent 7798769856fb5041d54fc498368a40cc91a14155
parent a5404a73030a29aee6e1b1e89c574b132444686d
author Bill Yi <byi@google.com> 1600498854 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600498854 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 20bea1511f am: 32ae7b0365 -s ours am: a5404a7303 -s ours

am skip reason: Change-Id Ic652534496edfbe408753f4a04f4daf51cccfc16 with SHA-1 45eac04dcb is in history

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

Change-Id: Ia8c1e0fe5e586cb2e81c5058e226b4203c7a2095