OSDN Git Service

Merge "Fix x86_64 build"
authorCalin Juravle <calin@google.com>
Thu, 27 Feb 2014 21:31:13 +0000 (21:31 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 27 Feb 2014 21:31:13 +0000 (21:31 +0000)

Trivial merge