From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 31 May 2016 22:23:11 +0000 (+0000)
Subject: Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6a55b1c6813050d04c39e0705da4f056f3981511;p=android-x86%2Fbuild.git

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

* commit '99e2c216b42bc2d7cad75f1f3aab432f12678b1d':
  Allow arm prebuilts for x86_arm builds

Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7
---

6a55b1c6813050d04c39e0705da4f056f3981511