OSDN Git Service

Merge "Fix x86 build."
authorElliott Hughes <enh@google.com>
Wed, 8 Aug 2012 23:07:26 +0000 (16:07 -0700)
committerandroid code review <noreply-gerritcodereview@google.com>
Wed, 8 Aug 2012 23:07:27 +0000 (16:07 -0700)

Trivial merge