diff options
| author | Raph Levien <raph@google.com> | 2015-11-05 15:23:56 -0800 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2015-11-05 15:23:56 -0800 |
| commit | 89f22e36cc287677e885d8b09f8e3b4c16fd8e19 (patch) | |
| tree | db93381f14b756de1e1e116be3a78aaef42dcf06 | |
| parent | 5fbfa8a3a5b0475a3dde90796b00efb991773892 (diff) | |
| download | noto-fonts-89f22e36cc287677e885d8b09f8e3b4c16fd8e19.tar.gz | |
resolve merge conflicts of b1a370c2ed to master.
Change-Id: I68b125ea8d8ee2de9fee595fba7754f3ff418ea5
| -rw-r--r-- | other/NotoColorEmoji.ttf | bin | 2718300 -> 2990212 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/other/NotoColorEmoji.ttf b/other/NotoColorEmoji.ttf Binary files differindex c6bb04c..f904710 100644 --- a/other/NotoColorEmoji.ttf +++ b/other/NotoColorEmoji.ttf |