OSDN Git Service

Merge "fix build"
authorTim Murray <timmurray@google.com>
Thu, 24 Jul 2014 22:20:58 +0000 (22:20 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 24 Jul 2014 22:07:52 +0000 (22:07 +0000)

Trivial merge