tree 363bbeb56c5a588c7e6c2cb803aec85362fa9c1d
parent ad214273e0033c4bdc5d0680b1e43ef799a10863
parent 3d8505a7182dc0b3c9b645142720bbab64cb5209
author Xin Li <delphij@google.com> 1598913472 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598913472 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: d51e98504b -s ours am: 3d8505a718 -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: I9365a3a9a1cc7c84cf45a44f681fbf33f526ce6f