tree defce1069327f3f171b4702bf4c1c76236735a1b
parent 37645e35154ec9d93b60e49f79ab2b7be414fff0
parent 91ac272c11775630735dde3190de9f2da8f3f3eb
author Ying Wang <wangying@google.com> 1458942670 +0000
committer android-build-merger <android-build-merger@google.com> 1458942670 +0000

Merge "Allow x86+arm multilib build."
am: 91ac272

* commit '91ac272c11775630735dde3190de9f2da8f3f3eb':
  Allow x86+arm multilib build.