OSDN Git Service

Merge "Fix windows and mac build"
authorJin Qian <jinqian@google.com>
Tue, 6 Dec 2016 02:19:07 +0000 (02:19 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 6 Dec 2016 02:19:08 +0000 (02:19 +0000)

Trivial merge