OSDN Git Service

Merge "Fix linux build."
authorBrian Carlstrom <bdc@google.com>
Wed, 25 Jun 2014 21:23:35 +0000 (21:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 25 Jun 2014 17:34:34 +0000 (17:34 +0000)

Trivial merge