tree ef9bdbe73c2b30c84bd518d38eefe33e528ab00d
parent 850ab8ee81b9a3527791c3200f7c6046663787fd
parent c7c92898cbabf3e813eae9de957f6d1da86f782a
author Xin Li <delphij@google.com> 1606970375 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606970375 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ecda196797 -s ours am: c7c92898cb -s ours

am skip reason: Change-Id Icbcbce7c8657e6424c3a98f5c4ee388a793122ae with SHA-1 60aea0a1ff is in history

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

Change-Id: I035dc09d0966115ba0c2491570f22216a418d126