OSDN Git Service

Merge "Re-enable disabled emoji tests [DO NOT MERGE]" into nyc-mr1-dev am: eab8a12845
authorRoozbeh Pournader <roozbeh@google.com>
Fri, 19 Aug 2016 22:49:54 +0000 (22:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 22:49:54 +0000 (22:49 +0000)
am: c178f807c4

Change-Id: I5ece66f93a63d4334b336ac37c30921743eb5d74


Trivial merge