From 511f1096dc586496cb3a8a666d8028bc022864af Mon Sep 17 00:00:00 2001
From: Doug Felt <dougfelt@google.com>
Date: Mon, 3 Apr 2017 14:42:22 -0700
Subject: [PATCH 1/2] Rebuild of NotoColorEmoji font.  Images should be the
 same.

---
 fonts/NotoColorEmoji.ttf | Bin 5334180 -> 5334180 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/fonts/NotoColorEmoji.ttf b/fonts/NotoColorEmoji.ttf
index ef7b725758c6a5a63c0a89739e957ff751e98217..02dd23849ade87630945301b59f64b535661ca82 100644
GIT binary patch
delta 292
zcmWlKxiUim007@6jz^HVkBB4gBko(=_f4TThRzo#DYlM(c;Day%qSGP=>3FVva>rI
zeSOBFQic2YZ=v}1_>#`u26xH)UyulcGT$G?r}BTo%=0T!GA41UkV>hNY6+!AY9%3c
zQZEgXl$10|lQc_<v`U+_ONVqym!zdzGSVZx(kK0rl>r%)AsLnt8I>^^mkF7aoJ`5I
z%*d?F$-FGcqAba>tjMaY$-3laLpEhgwq-|lWl#3yKn~?dj^#v7<xI}yLN4V>uHU(d
G9{vGWGf5Eu

delta 292
zcmWlKxiUim006UzBLs0@amIZUx5P~nH(y{3qsdoLY|THs$_MC~Q7Clz0HxZDUb3@0
z8+?9*gHlg7k+=Kw^W8(D@RGWYXZ}L5XsFEBd$CY{@#pvZ5h)p#h*U_WR7tf&rABHc
zCUsIT4HB0|X_97XkydGwcIl8#>5^_qNRRYNpY+Rs3`$alWLQRIRK{dnCS+2kWLjoq
zR_0`079=H$vLws0BCE0{>#`wf$;hT`$+qmsuI$Oa9LS+$B`0|~l4CiMQ#q4!xsc0O
Hu7cZtKXywG


From 893db190d7594f284cb73df631e5ffeb2b5ed4e7 Mon Sep 17 00:00:00 2001
From: Doug Felt <dougfelt@google.com>
Date: Wed, 5 Apr 2017 14:47:36 -0700
Subject: [PATCH 2/2] Add aliases for new version 5 emoji.

---
 emoji_aliases.txt | 52 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/emoji_aliases.txt b/emoji_aliases.txt
index 56a59b299..b873d741e 100644
--- a/emoji_aliases.txt
+++ b/emoji_aliases.txt
@@ -201,3 +201,55 @@ fe82b;unknown_flag # no name -> no name
 1f1ed_1f1f2;1f1e6_1f1fa # HM -> AU
 1f1f8_1f1ef;1f1f3_1f1f4 # SJ -> NO
 1f1fa_1f1f2;1f1fa_1f1f8 # UM -> US
+
+# additional emoji 5.0 aliases
+1f9d6;1f9d6_200d_2640 # PERSON IN STEAMY ROOM -> woman in steamy room
+1f9d6_1f3fb;1f9d6_1f3fb_200d_2640 # light skin tone
+1f9d6_1f3fc;1f9d6_1f3fc_200d_2640 # medium-light skin tone
+1f9d6_1f3fd;1f9d6_1f3fd_200d_2640 # medium skin tone
+1f9d6_1f3fe;1f9d6_1f3fe_200d_2640 # medium-dark skin tone
+1f9d6_1f3ff;1f9d6_1f3ff_200d_2640 # dark skin tone
+1f9d7;1f9d7_200d_2640 # PERSON CLIMBING -> woman climbing
+1f9d7_1f3fb;1f9d7_1f3fb_200d_2640 # light skin tone
+1f9d7_1f3fc;1f9d7_1f3fc_200d_2640 # medium-light skin tone
+1f9d7_1f3fd;1f9d7_1f3fd_200d_2640 # medium skin tone
+1f9d7_1f3fe;1f9d7_1f3fe_200d_2640 # medium-dark skin tone
+1f9d7_1f3ff;1f9d7_1f3ff_200d_2640 # dark skin tone
+1f9d8;1f9d8_200d_2640 # PERSON IN LOTUS POSITION -> woman in lotus position
+1f9d8_1f3fb;1f9d8_1f3fb_200d_2640 # light skin tone
+1f9d8_1f3fc;1f9d8_1f3fc_200d_2640 # medium-light skin tone
+1f9d8_1f3fd;1f9d8_1f3fd_200d_2640 # medium skin tone
+1f9d8_1f3fe;1f9d8_1f3fe_200d_2640 # medium-dark skin tone
+1f9d8_1f3ff;1f9d8_1f3ff_200d_2640 # dark skin tone
+1f9d9;1f9d9_200d_2640 # MAGE -> female mage
+1f9d9_1f3fb;1f9d9_1f3fb_200d_2640 # light skin tone
+1f9d9_1f3fc;1f9d9_1f3fc_200d_2640 # medium-light skin tone
+1f9d9_1f3fd;1f9d9_1f3fd_200d_2640 # medium skin tone
+1f9d9_1f3fe;1f9d9_1f3fe_200d_2640 # medium-dark skin tone
+1f9d9_1f3ff;1f9d9_1f3ff_200d_2640 # dark skin tone
+1f9da;1f9da_200d_2640 # FAIRY -> female fairy
+1f9da_1f3fb;1f9da_1f3fb_200d_2640 # light skin tone
+1f9da_1f3fc;1f9da_1f3fc_200d_2640 # medium-light skin tone
+1f9da_1f3fd;1f9da_1f3fd_200d_2640 # medium skin tone
+1f9da_1f3fe;1f9da_1f3fe_200d_2640 # medium-dark skin tone
+1f9da_1f3ff;1f9da_1f3ff_200d_2640 # dark skin tone
+1f9db;1f9db_200d_2640 # VAMPIRE -> female vampire
+1f9db_1f3fb;1f9db_1f3fb_200d_2640 # light skin tone
+1f9db_1f3fc;1f9db_1f3fc_200d_2640 # medium-light skin tone
+1f9db_1f3fd;1f9db_1f3fd_200d_2640 # medium skin tone
+1f9db_1f3fe;1f9db_1f3fe_200d_2640 # medium-dark skin tone
+1f9db_1f3ff;1f9db_1f3ff_200d_2640 # dark skin tone
+1f9dc;1f9dc_200d_2640 # MERPERSON -> mermaid
+1f9dc_1f3fb;1f9dc_1f3fb_200d_2640 # light skin tone
+1f9dc_1f3fc;1f9dc_1f3fc_200d_2640 # medium-light skin tone
+1f9dc_1f3fd;1f9dc_1f3fd_200d_2640 # medium skin tone
+1f9dc_1f3fe;1f9dc_1f3fe_200d_2640 # medium-dark skin tone
+1f9dc_1f3ff;1f9dc_1f3ff_200d_2640 # dark skin tone
+1f9dd;1f9dd_200d_2640 # ELF -> female elf
+1f9dd_1f3fb;1f9dd_1f3fb_200d_2640 # light skin tone
+1f9dd_1f3fc;1f9dd_1f3fc_200d_2640 # medium-light skin tone
+1f9dd_1f3fd;1f9dd_1f3fd_200d_2640 # medium skin tone
+1f9dd_1f3fe;1f9dd_1f3fe_200d_2640 # medium-dark skin tone
+1f9dd_1f3ff;1f9dd_1f3ff_200d_2640 # dark skin tone
+1f9de;1f9de_200d_2640 # GENIE -> female genie
+1f9df;1f9df_200d_2640 # ZOMBIE -> female zombie