tree 363bbeb56c5a588c7e6c2cb803aec85362fa9c1d
parent 10597d65665570a593a735603faf1871d152c7e8
parent d51e98504bb221fb8a56d06046d18bd42c2c706d
author Xin Li <delphij@google.com> 1598911335 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598911335 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: d51e98504b -s ours

am skip reason: Change-Id I940b5608806ee58ce31295b6e6da81200772dc46 with SHA-1 10597d6566 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/12470112

Change-Id: If4c2e655d3596b4eb2ec565844519a6fa98c69fb