OSDN Git Service

Merge "Fix build."
authorCalin Juravle <calin@google.com>
Thu, 6 Nov 2014 15:04:02 +0000 (15:04 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 6 Nov 2014 15:04:02 +0000 (15:04 +0000)

Trivial merge