| commit | f439e22fb6139618db8a84b7aa5d24c5f29b4077 | [log] [tgz] |
|---|---|---|
| author | Roozbeh Pournader <roozbeh@google.com> | Thu Apr 06 22:45:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 06 22:45:01 2017 +0000 |
| tree | 20784b1c710c2550be92a59eae432e0484a0a7d0 | |
| parent | b0e52bb5d2e2c8356418511225eeabfea43ec53a [diff] | |
| parent | 5ba27c46bb5215e3f5b0dce066a861504b198269 [diff] |
Merge "Use additions/emoji-data.txt instead of hardcoded values" into oc-dev am: 43fed9afe4 am: 5ba27c46bb Change-Id: I5530187fd5f32de752c82bd22b5d9ccb0496ce27