commit | e43a8d70a4d67effb6749207ac7e1053fa95540e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 00:40:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 00:40:03 2020 +0000 |
tree | 363bbeb56c5a588c7e6c2cb803aec85362fa9c1d | |
parent | d51e98504bb221fb8a56d06046d18bd42c2c706d [diff] | |
parent | cdc11f94731d8ee2d08ca7b1d66f8e2b2928d718 [diff] |
[automerger skipped] Merge Android R am: cdc11f9473 -s ours am skip reason: Change-Id I70c611122b5b5dd92fc7c17a0ef560dcb0efba70 with SHA-1 d51e98504b is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/zilla-slab/+/1422352 Change-Id: I828e1f6b293eec9496ca6d4c75230385fe2e17e9