OSDN Git Service

Merge "Fix mac build."
authorChristopher Ferris <cferris@google.com>
Fri, 11 Jul 2014 21:26:01 +0000 (21:26 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 11 Jul 2014 16:35:27 +0000 (16:35 +0000)

Trivial merge