tree f569a8499e573d4bd1c6b7bb4248b06be4bf6362
parent f4c5b344ae0845a80a05bd0a97906170fc552956
parent 84b1746130c0df855414dc8c39f4fe5f180b0c11
author Roozbeh Pournader <roozbeh@google.com> 1471642981 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471642986 +0000

Merge "Check defaults for Android default-emoji characters [DO NOT MERGE]" into nyc-mr1-dev