tree 9f76d07e818eda1582e864c6df0349cb596d650e
parent 1d7930b2bedad092189bca3336a9cf717b9b4f37
parent fcaae6bee83c62703339f0e54751b244ef7fd7b7
author Dan Willemsen <dwillemsen@google.com> 1464733219 +0000
committer android-build-merger <android-build-merger@google.com> 1464733219 +0000

Merge "Allow arm prebuilts for x86_arm builds"
am: fcaae6bee8

* commit 'fcaae6bee83c62703339f0e54751b244ef7fd7b7':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ia8a3cd4736afbf7920f4b5383cb24c99a0f9df41