OSDN Git Service

Merge "(Hopefully) fix the Mac build."
authorDan Albert <danalbert@google.com>
Wed, 4 Mar 2015 01:46:22 +0000 (01:46 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 4 Mar 2015 01:46:22 +0000 (01:46 +0000)

Trivial merge