OSDN Git Service

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

Change-Id: I653c3539906407229bf98b2646706083aba88334