OSDN Git Service

Merge "Patch out part of the emoji tests."
authorRaph Levien <raph@google.com>
Tue, 12 Jul 2016 23:25:59 +0000 (23:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 12 Jul 2016 23:26:00 +0000 (23:26 +0000)

Trivial merge