OSDN Git Service

Merge "Fix mac build."
authorIan Rogers <irogers@google.com>
Tue, 4 Nov 2014 22:45:09 +0000 (22:45 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 4 Nov 2014 22:45:09 +0000 (22:45 +0000)
commit4150611d5229c87e49762b9edf6540995eb325e1
tree408c85fcf5f889b2cb81a8ee9b6dd1746b4c1aa8
parentcc19cb6845f427036513e155d50c11533933c63f
parentde2db523960444ca8abd175814374cb3782f1632
Merge "Fix mac build."