commit | 2de1fb3e83802fddd44db6c14c62d73821999efd | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:01 2020 +0000 |
tree | 1a5e8ea665eb5dd75d567f3f64ff5161396794b2 | |
parent | 010933c17abec1be5a391deb801ddc6fd4147454 [diff] | |
parent | a335c1f83c252f9fe775ac5b98522e63d6ad9279 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 1167dff97a am: 2bc33f66a9 -s ours am: 96ae9e3528 -s ours am: a335c1f83c -s ours am skip reason: Change-Id I602373f15230605028687b442f0ed7f98131614a with SHA-1 fb4fd5ed26 is in history Original change: https://android-review.googlesource.com/c/platform/external/google-fonts/karla/+/1430116 Change-Id: I72c68d007e8837b826b67502ece166714095ebf3