| commit | 1df0045c27f0dc0835a21ca58fa6b6709a08b205 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:27 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:27 2020 +0000 |
| tree | 363bbeb56c5a588c7e6c2cb803aec85362fa9c1d | |
| parent | da925ec72261ddcd19e07283876e80d835339314 [diff] | |
| parent | 5c86ef4a872a2132a84bca543c7eb61b52efcc1d [diff] |
[automerger skipped] Merge Android R am: cdc11f9473 -s ours am: e43a8d70a4 -s ours am: 5c86ef4a87 -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: I0ccb140eb2e7309f5a670aa85db0cfd6ad27cf63