| commit | 43fed9afe41ee5cf7bc208f37f373d7061b5be19 | [log] [tgz] |
|---|---|---|
| author | Roozbeh Pournader <roozbeh@google.com> | Thu Apr 06 21:13:22 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 06 21:13:28 2017 +0000 |
| tree | 39597cc22e36d2bd92679b3f7d569be533be685e | |
| parent | 0dc7596ee3573b94bcdf4f4e6150173576c43431 [diff] | |
| parent | f7a68c10c70c0537bb1ea3a6a2b54b8800102859 [diff] |
Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev