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)
commitb849f6dd638fd1246724160cd5c01ab1a5ff33bd
treeafe0dc3ed038d8b1d97548831a230e7f3160403b
parente334cca5b9840a123a298efd1a00956f621341e4
parent39b1ef077f61c27ef5aa0db18bb479d6b8fb0e59
Merge "Fix linux build."