OSDN Git Service

Merge "Fix x86 build."
authorElliott Hughes <enh@google.com>
Tue, 18 Feb 2014 20:35:15 +0000 (20:35 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 18 Feb 2014 20:35:15 +0000 (20:35 +0000)

Trivial merge