OSDN Git Service

Merge "Fix stub_test after semantic conflicting merge."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 24 Mar 2016 14:33:39 +0000 (14:33 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 24 Mar 2016 14:33:39 +0000 (14:33 +0000)
commit1345aa365e8baae25d2b3a859a4858fffbe6b11f
treecaeaad92dd1a4cd7b02bd8f670c257fe6a5267cd
parent594973c83bb9187e392a7daf61b570dfe0aa3e08
parent484fb9fde79c9c36d186cd2c7cfd8ad51f2ffead
Merge "Fix stub_test after semantic conflicting merge."