Merge pull request #3920 from love-ginger/master
authorWouter van Oortmerssen <wvo@google.com>
Fri, 1 Jul 2016 16:48:09 +0000 (09:48 -0700)
committerGitHub <noreply@github.com>
Fri, 1 Jul 2016 16:48:09 +0000 (09:48 -0700)
commitb999d4994544ff3d7792f881ededda58b206e2d3
treebd6070eec8c7634869cf386a474b19dfd8faf65c
parent48f37f9e0a04f2b60046dda7fef20a8b0ebc1a70
parent5ea2b49f58462728a895bc61ba290f16bed220d3
Merge pull request #3920 from love-ginger/master

Fix mac build error