OSDN Git Service

Merge "Allow x86+arm multilib build." am: 91ac272
authorYing Wang <wangying@google.com>
Fri, 25 Mar 2016 21:53:52 +0000 (21:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 25 Mar 2016 21:53:52 +0000 (21:53 +0000)
am: 837e418

* commit '837e4189088103255a2e220b06d1a62e5842e5af':
  Allow x86+arm multilib build.


Trivial merge