summaryrefslogtreecommitdiffstats
path: root/data/fonts
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-07-02 18:19:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-02 18:19:36 +0000
commitc82b76c7fadf218d9fc3f3d73f46dcfc14fbb592 (patch)
tree528b38d080a04d358c05c54592a4faff87ea66eb /data/fonts
parentcbc13f057f8cf6d2fda86d661117d8df3e03c40e (diff)
parent37e5ceac65021f434324de6e80a223071223a206 (diff)
downloadframeworks_base-c82b76c7fadf218d9fc3f3d73f46dcfc14fbb592.zip
frameworks_base-c82b76c7fadf218d9fc3f3d73f46dcfc14fbb592.tar.gz
frameworks_base-c82b76c7fadf218d9fc3f3d73f46dcfc14fbb592.tar.bz2
am c91ee2f9: Merge "Add nameID 4 to AndroidEmoji" into lmp-preview-dev
* commit 'c91ee2f9f42e6e443fec231d5090c9557af8be68': Add nameID 4 to AndroidEmoji
Diffstat (limited to 'data/fonts')
-rw-r--r--data/fonts/AndroidEmoji.ttfbin2748 -> 2760 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf
index 98f72e7..8bdc26a 100644
--- a/data/fonts/AndroidEmoji.ttf
+++ b/data/fonts/AndroidEmoji.ttf
Binary files differ