OSDN Git Service

Re-enable disabled emoji tests [DO NOT MERGE] am: 8cd1b1ba80
authorRoozbeh Pournader <roozbeh@google.com>
Fri, 19 Aug 2016 22:48:15 +0000 (22:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 22:48:15 +0000 (22:48 +0000)
am: 1062853800

Change-Id: Ie4c1a28f0a37af3fbbce3a8611c1ab5eec79d556


Trivial merge