OSDN Git Service

Merge "Fix mips and x86 builds"
authorDimitry Ivanov <dimitry@google.com>
Thu, 29 Oct 2015 00:56:57 +0000 (00:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Oct 2015 00:56:57 +0000 (00:56 +0000)
am: 50e9279589

* commit '50e92795890c0d8b4bf54c535f66f3b2edf7bd59':
  Fix mips and x86 builds


Trivial merge