OSDN Git Service

am 9cb3708f: Merge "x86 build fix."
authorIan Rogers <irogers@google.com>
Fri, 17 Oct 2014 09:22:15 +0000 (09:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Oct 2014 09:22:15 +0000 (09:22 +0000)
* commit '9cb3708f62dad3f32a1ff2fa3f0a745d8d524a32':
  x86 build fix.


Trivial merge