tree 72ccfb4f23423bfa6996e286cac62f260e5c6725
parent 73da8f95b33104d3308dd46f271c8af70cca80df
parent 43fed9afe41ee5cf7bc208f37f373d7061b5be19
author Roozbeh Pournader <roozbeh@google.com> 1491513603 +0000
committer android-build-merger <android-build-merger@google.com> 1491513603 +0000

Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev
am: 43fed9afe4

Change-Id: I3c077353adf8040118b0610248848fe3d552a70e