tree 943f4b438424db01ea0385cfc9d67b029467df29
parent ca98781c618a694ce4062429d7f8bcc3fa1d9fa7
parent 55ad6e8d2d410e57aa46a13b961e8f904468843e
author Siyamed Sinir <siyamed@google.com> 1532496299 -0700
committer android-build-merger <android-build-merger@google.com> 1532496299 -0700

Merge "Update EmojiCompat font for Unicode 11" am: d20a289eae
am: 55ad6e8d2d

Change-Id: I7f31d845927e5e982eb3563dc1a60e35e52bb8c2