OSDN Git Service

Merge "Fix build aflter conflicting changes got in."
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 18 Feb 2016 16:56:42 +0000 (16:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 18 Feb 2016 16:56:43 +0000 (16:56 +0000)

Trivial merge