diff options
author | Scott Lobdell <slobdell@google.com> | 2022-04-08 23:25:04 +0000 |
---|---|---|
committer | Scott Lobdell <slobdell@google.com> | 2022-04-08 23:34:56 +0000 |
commit | bc47a30b2018d8c599c8d6f87f4e7c24ea359ab7 (patch) | |
tree | 04de8c293b71ee4e8026e7f2bfd235e4aaf76415 | |
parent | 446e6bcd4e3bee3cf4a0548288818f28dd7a2cea (diff) | |
parent | d86cd8bee313de19882772e944524abe089b6389 (diff) |
Merge TP1A.220404.001
Change-Id: Ic8f5c749f1ee2aa771b291dd58fad48bdccde937
-rw-r--r-- | OWNERS | 10 | ||||
-rw-r--r-- | emoji-compat/font/NotoColorEmojiCompat.ttf | bin | 2932728 -> 2961984 bytes |
2 files changed, 6 insertions, 4 deletions
@@ -1,6 +1,8 @@ -# Default code reviewers picked from top 3 or more developers. -# Please update this list if you find better candidates. -dougfelt@google.com -siyamed@google.com +# Android owners nona@google.com +siyamed@google.com +seanmcq@google.com + +# Upstream font owners marekj@google.com +rsheeter@google.com diff --git a/emoji-compat/font/NotoColorEmojiCompat.ttf b/emoji-compat/font/NotoColorEmojiCompat.ttf Binary files differindex 9547537..3fc780f 100644 --- a/emoji-compat/font/NotoColorEmojiCompat.ttf +++ b/emoji-compat/font/NotoColorEmojiCompat.ttf |