OSDN Git Service

Merge "Fix mac build."
authorChristopher Ferris <cferris@google.com>
Fri, 11 Jul 2014 21:26:01 +0000 (21:26 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 11 Jul 2014 16:35:27 +0000 (16:35 +0000)
commitbfe9d08e93f6b866e7ecc63f32083e3fc868e606
tree8e148cb56b1d31bd7285bd4641a6c751095980b0
parent438b9039c77b2c9556f362e8cbbefcf21c55b527
parentae91207f068d3fac6c5a116bc9117f1f83201c6a
Merge "Fix mac build."