OSDN Git Service

Merge "Read emoji addtions from data file"
authorRoozbeh Pournader <roozbeh@google.com>
Mon, 20 Mar 2017 02:59:20 +0000 (02:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 20 Mar 2017 02:59:25 +0000 (02:59 +0000)

Trivial merge