Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"
diff --git a/additions/emoji-zwj-sequences.txt b/additions/emoji-zwj-sequences.txt
index d095bdb..02d4125 100644
--- a/additions/emoji-zwj-sequences.txt
+++ b/additions/emoji-zwj-sequences.txt
@@ -16,3 +16,172 @@
1F93C 1F3FE 200D 2642 FE0F ; Emoji_ZWJ_Sequence ; men wrestling: medium-dark skin tone
1F93C 1F3FF 200D 2640 FE0F ; Emoji_ZWJ_Sequence ; women wrestling: dark skin tone
1F93C 1F3FF 200D 2642 FE0F ; Emoji_ZWJ_Sequence ; men wrestling: dark skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FC ; Emoji_ZWJ_Sequence ; men holding hands: light skin tone, medium-light skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FD ; Emoji_ZWJ_Sequence ; men holding hands: light skin tone, medium skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FE ; Emoji_ZWJ_Sequence ; men holding hands: light skin tone, medium-dark skin tone
+1F468 1F3FB 200D 1F91D 200D 1F468 1F3FF ; Emoji_ZWJ_Sequence ; men holding hands: light skin tone, dark skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FD ; Emoji_ZWJ_Sequence ; men holding hands: medium-light skin tone, medium skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FE ; Emoji_ZWJ_Sequence ; men holding hands: medium-light skin tone, medium-dark skin tone
+1F468 1F3FC 200D 1F91D 200D 1F468 1F3FF ; Emoji_ZWJ_Sequence ; men holding hands: medium-light skin tone, dark skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FE ; Emoji_ZWJ_Sequence ; men holding hands: medium skin tone, medium-dark skin tone
+1F468 1F3FD 200D 1F91D 200D 1F468 1F3FF ; Emoji_ZWJ_Sequence ; men holding hands: medium skin tone, dark skin tone
+1F468 1F3FE 200D 1F91D 200D 1F468 1F3FF ; Emoji_ZWJ_Sequence ; men holding hands: medium-dark skin tone, dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FC ; Emoji_ZWJ_Sequence ; women holding hands: light skin tone, medium-light skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FD ; Emoji_ZWJ_Sequence ; women holding hands: light skin tone, medium skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FE ; Emoji_ZWJ_Sequence ; women holding hands: light skin tone, medium-dark skin tone
+1F469 1F3FB 200D 1F91D 200D 1F469 1F3FF ; Emoji_ZWJ_Sequence ; women holding hands: light skin tone, dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FD ; Emoji_ZWJ_Sequence ; women holding hands: medium-light skin tone, medium skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FE ; Emoji_ZWJ_Sequence ; women holding hands: medium-light skin tone, medium-dark skin tone
+1F469 1F3FC 200D 1F91D 200D 1F469 1F3FF ; Emoji_ZWJ_Sequence ; women holding hands: medium-light skin tone, dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FE ; Emoji_ZWJ_Sequence ; women holding hands: medium skin tone, medium-dark skin tone
+1F469 1F3FD 200D 1F91D 200D 1F469 1F3FF ; Emoji_ZWJ_Sequence ; women holding hands: medium skin tone, dark skin tone
+1F469 1F3FE 200D 1F91D 200D 1F469 1F3FF ; Emoji_ZWJ_Sequence ; women holding hands: medium-dark skin tone, dark skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FC ; Emoji_ZWJ_Sequence ; people holding hands: light skin tone, medium-light skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FD ; Emoji_ZWJ_Sequence ; people holding hands: light skin tone, medium skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FE ; Emoji_ZWJ_Sequence ; people holding hands: light skin tone, medium-dark skin tone
+1F9D1 1F3FB 200D 1F91D 200D 1F9D1 1F3FF ; Emoji_ZWJ_Sequence ; people holding hands: light skin tone, dark skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FD ; Emoji_ZWJ_Sequence ; people holding hands: medium-light skin tone, medium skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FE ; Emoji_ZWJ_Sequence ; people holding hands: medium-light skin tone, medium-dark skin tone
+1F9D1 1F3FC 200D 1F91D 200D 1F9D1 1F3FF ; Emoji_ZWJ_Sequence ; people holding hands: medium-light skin tone, dark skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FE ; Emoji_ZWJ_Sequence ; people holding hands: medium skin tone, medium-dark skin tone
+1F9D1 1F3FD 200D 1F91D 200D 1F9D1 1F3FF ; Emoji_ZWJ_Sequence ; people holding hands: medium skin tone, dark skin tone
+1F9D1 1F3FE 200D 1F91D 200D 1F9D1 1F3FF ; Emoji_ZWJ_Sequence ; people holding hands: medium-dark skin tone, dark skin tone
+1F9D1 200D 1F9AF ; Emoji_ZWJ_Sequence ; person with probing cane
+1F9D1 200D 1F9BC ; Emoji_ZWJ_Sequence ; person in motorized wheelchair
+1F9D1 200D 1F9BD ; Emoji_ZWJ_Sequence ; person in manual wheelchair
+1F9D1 1F3FB 200D 1F9AF ; Emoji_ZWJ_Sequence ; person with probing cane: light skin tone
+1F9D1 1F3FC 200D 1F9AF ; Emoji_ZWJ_Sequence ; person with probing cane: medium-light skin tone
+1F9D1 1F3FD 200D 1F9AF ; Emoji_ZWJ_Sequence ; person with probing cane: medium skin tone
+1F9D1 1F3FE 200D 1F9AF ; Emoji_ZWJ_Sequence ; person with probing cane: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9AF ; Emoji_ZWJ_Sequence ; person with probing cane: dark skin tone
+1F9D1 1F3FB 200D 1F9BC ; Emoji_ZWJ_Sequence ; person in motorized wheelchair: light skin tone
+1F9D1 1F3FC 200D 1F9BC ; Emoji_ZWJ_Sequence ; person in motorized wheelchair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BC ; Emoji_ZWJ_Sequence ; person in motorized wheelchair: medium skin tone
+1F9D1 1F3FE 200D 1F9BC ; Emoji_ZWJ_Sequence ; person in motorized wheelchair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BC ; Emoji_ZWJ_Sequence ; person in motorized wheelchair: dark skin tone
+1F9D1 1F3FB 200D 1F9BD ; Emoji_ZWJ_Sequence ; person in manual wheelchair: light skin tone
+1F9D1 1F3FC 200D 1F9BD ; Emoji_ZWJ_Sequence ; person in manual wheelchair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9BD ; Emoji_ZWJ_Sequence ; person in manual wheelchair: medium skin tone
+1F9D1 1F3FE 200D 1F9BD ; Emoji_ZWJ_Sequence ; person in manual wheelchair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9BD ; Emoji_ZWJ_Sequence ; person in manual wheelchair: dark skin tone
+1F9D1 200D 2695 FE0F ; Emoji_ZWJ_Sequence ; health worker
+1F9D1 200D 1F393 ; Emoji_ZWJ_Sequence ; student
+1F9D1 200D 1F3EB ; Emoji_ZWJ_Sequence ; teacher
+1F9D1 200D 2696 FE0F ; Emoji_ZWJ_Sequence ; judge
+1F9D1 200D 1F33E ; Emoji_ZWJ_Sequence ; farmer
+1F9D1 200D 1F373 ; Emoji_ZWJ_Sequence ; cook
+1F9D1 200D 1F527 ; Emoji_ZWJ_Sequence ; mechanic
+1F9D1 200D 1F3ED ; Emoji_ZWJ_Sequence ; factory worker
+1F9D1 200D 1F4BC ; Emoji_ZWJ_Sequence ; office worker
+1F9D1 200D 1F52C ; Emoji_ZWJ_Sequence ; scientist
+1F9D1 200D 1F4BB ; Emoji_ZWJ_Sequence ; technologist
+1F9D1 200D 1F3A4 ; Emoji_ZWJ_Sequence ; singer
+1F9D1 200D 1F3A8 ; Emoji_ZWJ_Sequence ; artist
+1F9D1 200D 2708 FE0F ; Emoji_ZWJ_Sequence ; pilot
+1F9D1 200D 1F680 ; Emoji_ZWJ_Sequence ; astronaut
+1F9D1 200D 1F692 ; Emoji_ZWJ_Sequence ; firefighter
+1F9D1 1F3FB 200D 2695 FE0F ; Emoji_ZWJ_Sequence ; health worker: light skin tone
+1F9D1 1F3FC 200D 2695 FE0F ; Emoji_ZWJ_Sequence ; health worker: medium-light skin tone
+1F9D1 1F3FD 200D 2695 FE0F ; Emoji_ZWJ_Sequence ; health worker: medium skin tone
+1F9D1 1F3FE 200D 2695 FE0F ; Emoji_ZWJ_Sequence ; health worker: medium-dark skin tone
+1F9D1 1F3FF 200D 2695 FE0F ; Emoji_ZWJ_Sequence ; health worker: dark skin tone
+1F9D1 1F3FB 200D 1F393 ; Emoji_ZWJ_Sequence ; student: light skin tone
+1F9D1 1F3FC 200D 1F393 ; Emoji_ZWJ_Sequence ; student: medium-light skin tone
+1F9D1 1F3FD 200D 1F393 ; Emoji_ZWJ_Sequence ; student: medium skin tone
+1F9D1 1F3FE 200D 1F393 ; Emoji_ZWJ_Sequence ; student: medium-dark skin tone
+1F9D1 1F3FF 200D 1F393 ; Emoji_ZWJ_Sequence ; student: dark skin tone
+1F9D1 1F3FB 200D 1F3EB ; Emoji_ZWJ_Sequence ; teacher: light skin tone
+1F9D1 1F3FC 200D 1F3EB ; Emoji_ZWJ_Sequence ; teacher: medium-light skin tone
+1F9D1 1F3FD 200D 1F3EB ; Emoji_ZWJ_Sequence ; teacher: medium skin tone
+1F9D1 1F3FE 200D 1F3EB ; Emoji_ZWJ_Sequence ; teacher: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3EB ; Emoji_ZWJ_Sequence ; teacher: dark skin tone
+1F9D1 1F3FB 200D 2696 FE0F ; Emoji_ZWJ_Sequence ; judge: light skin tone
+1F9D1 1F3FC 200D 2696 FE0F ; Emoji_ZWJ_Sequence ; judge: medium-light skin tone
+1F9D1 1F3FD 200D 2696 FE0F ; Emoji_ZWJ_Sequence ; judge: medium skin tone
+1F9D1 1F3FE 200D 2696 FE0F ; Emoji_ZWJ_Sequence ; judge: medium-dark skin tone
+1F9D1 1F3FF 200D 2696 FE0F ; Emoji_ZWJ_Sequence ; judge: dark skin tone
+1F9D1 1F3FB 200D 1F33E ; Emoji_ZWJ_Sequence ; farmer: light skin tone
+1F9D1 1F3FC 200D 1F33E ; Emoji_ZWJ_Sequence ; farmer: medium-light skin tone
+1F9D1 1F3FD 200D 1F33E ; Emoji_ZWJ_Sequence ; farmer: medium skin tone
+1F9D1 1F3FE 200D 1F33E ; Emoji_ZWJ_Sequence ; farmer: medium-dark skin tone
+1F9D1 1F3FF 200D 1F33E ; Emoji_ZWJ_Sequence ; farmer: dark skin tone
+1F9D1 1F3FB 200D 1F373 ; Emoji_ZWJ_Sequence ; cook: light skin tone
+1F9D1 1F3FC 200D 1F373 ; Emoji_ZWJ_Sequence ; cook: medium-light skin tone
+1F9D1 1F3FD 200D 1F373 ; Emoji_ZWJ_Sequence ; cook: medium skin tone
+1F9D1 1F3FE 200D 1F373 ; Emoji_ZWJ_Sequence ; cook: medium-dark skin tone
+1F9D1 1F3FF 200D 1F373 ; Emoji_ZWJ_Sequence ; cook: dark skin tone
+1F9D1 1F3FB 200D 1F527 ; Emoji_ZWJ_Sequence ; mechanic: light skin tone
+1F9D1 1F3FC 200D 1F527 ; Emoji_ZWJ_Sequence ; mechanic: medium-light skin tone
+1F9D1 1F3FD 200D 1F527 ; Emoji_ZWJ_Sequence ; mechanic: medium skin tone
+1F9D1 1F3FE 200D 1F527 ; Emoji_ZWJ_Sequence ; mechanic: medium-dark skin tone
+1F9D1 1F3FF 200D 1F527 ; Emoji_ZWJ_Sequence ; mechanic: dark skin tone
+1F9D1 1F3FB 200D 1F3ED ; Emoji_ZWJ_Sequence ; factory worker: light skin tone
+1F9D1 1F3FC 200D 1F3ED ; Emoji_ZWJ_Sequence ; factory worker: medium-light skin tone
+1F9D1 1F3FD 200D 1F3ED ; Emoji_ZWJ_Sequence ; factory worker: medium skin tone
+1F9D1 1F3FE 200D 1F3ED ; Emoji_ZWJ_Sequence ; factory worker: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3ED ; Emoji_ZWJ_Sequence ; factory worker: dark skin tone
+1F9D1 1F3FB 200D 1F4BC ; Emoji_ZWJ_Sequence ; office worker: light skin tone
+1F9D1 1F3FC 200D 1F4BC ; Emoji_ZWJ_Sequence ; office worker: medium-light skin tone
+1F9D1 1F3FD 200D 1F4BC ; Emoji_ZWJ_Sequence ; office worker: medium skin tone
+1F9D1 1F3FE 200D 1F4BC ; Emoji_ZWJ_Sequence ; office worker: medium-dark skin tone
+1F9D1 1F3FF 200D 1F4BC ; Emoji_ZWJ_Sequence ; office worker: dark skin tone
+1F9D1 1F3FB 200D 1F52C ; Emoji_ZWJ_Sequence ; scientist: light skin tone
+1F9D1 1F3FC 200D 1F52C ; Emoji_ZWJ_Sequence ; scientist: medium-light skin tone
+1F9D1 1F3FD 200D 1F52C ; Emoji_ZWJ_Sequence ; scientist: medium skin tone
+1F9D1 1F3FE 200D 1F52C ; Emoji_ZWJ_Sequence ; scientist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F52C ; Emoji_ZWJ_Sequence ; scientist: dark skin tone
+1F9D1 1F3FB 200D 1F4BB ; Emoji_ZWJ_Sequence ; technologist: light skin tone
+1F9D1 1F3FC 200D 1F4BB ; Emoji_ZWJ_Sequence ; technologist: medium-light skin tone
+1F9D1 1F3FD 200D 1F4BB ; Emoji_ZWJ_Sequence ; technologist: medium skin tone
+1F9D1 1F3FE 200D 1F4BB ; Emoji_ZWJ_Sequence ; technologist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F4BB ; Emoji_ZWJ_Sequence ; technologist: dark skin tone
+1F9D1 1F3FB 200D 1F3A4 ; Emoji_ZWJ_Sequence ; singer: light skin tone
+1F9D1 1F3FC 200D 1F3A4 ; Emoji_ZWJ_Sequence ; singer: medium-light skin tone
+1F9D1 1F3FD 200D 1F3A4 ; Emoji_ZWJ_Sequence ; singer: medium skin tone
+1F9D1 1F3FE 200D 1F3A4 ; Emoji_ZWJ_Sequence ; singer: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3A4 ; Emoji_ZWJ_Sequence ; singer: dark skin tone
+1F9D1 1F3FB 200D 1F3A8 ; Emoji_ZWJ_Sequence ; artist: light skin tone
+1F9D1 1F3FC 200D 1F3A8 ; Emoji_ZWJ_Sequence ; artist: medium-light skin tone
+1F9D1 1F3FD 200D 1F3A8 ; Emoji_ZWJ_Sequence ; artist: medium skin tone
+1F9D1 1F3FE 200D 1F3A8 ; Emoji_ZWJ_Sequence ; artist: medium-dark skin tone
+1F9D1 1F3FF 200D 1F3A8 ; Emoji_ZWJ_Sequence ; artist: dark skin tone
+1F9D1 1F3FB 200D 2708 FE0F ; Emoji_ZWJ_Sequence ; pilot: light skin tone
+1F9D1 1F3FC 200D 2708 FE0F ; Emoji_ZWJ_Sequence ; pilot: medium-light skin tone
+1F9D1 1F3FD 200D 2708 FE0F ; Emoji_ZWJ_Sequence ; pilot: medium skin tone
+1F9D1 1F3FE 200D 2708 FE0F ; Emoji_ZWJ_Sequence ; pilot: medium-dark skin tone
+1F9D1 1F3FF 200D 2708 FE0F ; Emoji_ZWJ_Sequence ; pilot: dark skin tone
+1F9D1 1F3FB 200D 1F680 ; Emoji_ZWJ_Sequence ; astronaut: light skin tone
+1F9D1 1F3FC 200D 1F680 ; Emoji_ZWJ_Sequence ; astronaut: medium-light skin tone
+1F9D1 1F3FD 200D 1F680 ; Emoji_ZWJ_Sequence ; astronaut: medium skin tone
+1F9D1 1F3FE 200D 1F680 ; Emoji_ZWJ_Sequence ; astronaut: medium-dark skin tone
+1F9D1 1F3FF 200D 1F680 ; Emoji_ZWJ_Sequence ; astronaut: dark skin tone
+1F9D1 1F3FB 200D 1F692 ; Emoji_ZWJ_Sequence ; firefighter: light skin tone
+1F9D1 1F3FC 200D 1F692 ; Emoji_ZWJ_Sequence ; firefighter: medium-light skin tone
+1F9D1 1F3FD 200D 1F692 ; Emoji_ZWJ_Sequence ; firefighter: medium skin tone
+1F9D1 1F3FE 200D 1F692 ; Emoji_ZWJ_Sequence ; firefighter: medium-dark skin tone
+1F9D1 1F3FF 200D 1F692 ; Emoji_ZWJ_Sequence ; firefighter: dark skin tone
+1F9D1 200D 1F9B0 ; Emoji_ZWJ_Sequence ; person: red hair
+1F9D1 200D 1F9B1 ; Emoji_ZWJ_Sequence ; person: curly hair
+1F9D1 200D 1F9B3 ; Emoji_ZWJ_Sequence ; person: white hair
+1F9D1 200D 1F9B2 ; Emoji_ZWJ_Sequence ; person: bald
+1F9D1 1F3FB 200D 1F9B0 ; Emoji_ZWJ_Sequence ; person: red hair: light skin tone
+1F9D1 1F3FC 200D 1F9B0 ; Emoji_ZWJ_Sequence ; person: red hair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9B0 ; Emoji_ZWJ_Sequence ; person: red hair: medium skin tone
+1F9D1 1F3FE 200D 1F9B0 ; Emoji_ZWJ_Sequence ; person: red hair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9B0 ; Emoji_ZWJ_Sequence ; person: red hair: dark skin tone
+1F9D1 1F3FB 200D 1F9B1 ; Emoji_ZWJ_Sequence ; person: curly hair: light skin tone
+1F9D1 1F3FC 200D 1F9B1 ; Emoji_ZWJ_Sequence ; person: curly hair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9B1 ; Emoji_ZWJ_Sequence ; person: curly hair: medium skin tone
+1F9D1 1F3FE 200D 1F9B1 ; Emoji_ZWJ_Sequence ; person: curly hair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9B1 ; Emoji_ZWJ_Sequence ; person: curly hair: dark skin tone
+1F9D1 1F3FB 200D 1F9B3 ; Emoji_ZWJ_Sequence ; person: white hair: light skin tone
+1F9D1 1F3FC 200D 1F9B3 ; Emoji_ZWJ_Sequence ; person: white hair: medium-light skin tone
+1F9D1 1F3FD 200D 1F9B3 ; Emoji_ZWJ_Sequence ; person: white hair: medium skin tone
+1F9D1 1F3FE 200D 1F9B3 ; Emoji_ZWJ_Sequence ; person: white hair: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9B3 ; Emoji_ZWJ_Sequence ; person: white hair: dark skin tone
+1F9D1 1F3FB 200D 1F9B2 ; Emoji_ZWJ_Sequence ; person: bald: light skin tone
+1F9D1 1F3FC 200D 1F9B2 ; Emoji_ZWJ_Sequence ; person: bald: medium-light skin tone
+1F9D1 1F3FD 200D 1F9B2 ; Emoji_ZWJ_Sequence ; person: bald: medium skin tone
+1F9D1 1F3FE 200D 1F9B2 ; Emoji_ZWJ_Sequence ; person: bald: medium-dark skin tone
+1F9D1 1F3FF 200D 1F9B2 ; Emoji_ZWJ_Sequence ; person: bald: dark skin tone
+
