summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 03:33:27 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 03:33:27 +0000
commit1df0045c27f0dc0835a21ca58fa6b6709a08b205 (patch)
tree363bbeb56c5a588c7e6c2cb803aec85362fa9c1d
parentda925ec72261ddcd19e07283876e80d835339314 (diff)
parent5c86ef4a872a2132a84bca543c7eb61b52efcc1d (diff)
downloadzilla-slab-1df0045c27f0dc0835a21ca58fa6b6709a08b205.tar.gz
[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
0 files changed, 0 insertions, 0 deletions