OSDN Git Service

Merge "Fix x86 master build failure."
authorbuzbee <buzbee@google.com>
Thu, 27 Mar 2014 19:24:15 +0000 (19:24 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 27 Mar 2014 19:24:15 +0000 (19:24 +0000)

Trivial merge