OSDN Git Service

Merge "Another go at fixing the Mac build."
authorElliott Hughes <enh@google.com>
Mon, 10 Aug 2015 21:52:31 +0000 (21:52 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 10 Aug 2015 21:52:31 +0000 (21:52 +0000)

Trivial merge