OSDN Git Service

Merge "Fix mac build."
authorChristopher Ferris <cferris@google.com>
Tue, 15 Sep 2015 23:29:05 +0000 (23:29 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 15 Sep 2015 23:29:05 +0000 (23:29 +0000)
commit35a68e69ce08e2d6c2c4696330b0cf918e167559
tree337c3d0b6850bb8ac995f3967003586a5eae19ae
parent168437c1ae6cd7fcbad344582efd6a5cfe660ff0
parent9deefaa9438cffab577acb8f70ad40b4df3e40d4
Merge "Fix mac build."