tree 96431efbe13f582796b096df36459ee8fea78e34
parent b67799172f7d17ac075e0cc98a150f87f9f48ab1
parent 1800ba4ffe76de2652151e43efb2a054d105c7ad
author Roozbeh Pournader <roozbeh@google.com> 1489978760 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1489978765 +0000

Merge "Read emoji addtions from data file"