OSDN Git Service

Merge "Fix build break from merge conflict"
authorMathieu Chartier <mathieuc@google.com>
Wed, 5 Oct 2016 00:54:38 +0000 (00:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 5 Oct 2016 00:54:39 +0000 (00:54 +0000)

Trivial merge