Skip to content
Commit 5ba27c46 authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by android-build-merger
Browse files

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

am: 43fed9af

Change-Id: I3c077353adf8040118b0610248848fe3d552a70e
parents 73da8f95 43fed9af
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment