OSDN Git Service

Merge "Fix build."
authorIan Rogers <irogers@google.com>
Tue, 4 Nov 2014 23:13:47 +0000 (23:13 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 4 Nov 2014 23:13:47 +0000 (23:13 +0000)
commit587e2ec64cbe56717bc978bff914c5f2f1455fe9
tree1bc2eebab5f3c7536c24324d3e1dbfd75cc7b25b
parent4150611d5229c87e49762b9edf6540995eb325e1
parent7dc9c81aee48928bd7a723fd9a4caed63d196f8f
Merge "Fix build."