OSDN Git Service

Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8
authorDan Willemsen <dwillemsen@google.com>
Tue, 31 May 2016 22:23:11 +0000 (22:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 22:23:11 +0000 (22:23 +0000)
commit6a55b1c6813050d04c39e0705da4f056f3981511
treedf1f9042a4c89fc40b55252ce75f833aab145a59
parenteaa4ef4cfc7faecde17e21a4016d95ff8913f459
parent99e2c216b42bc2d7cad75f1f3aab432f12678b1d
Merge "Allow arm prebuilts for x86_arm builds" am: fcaae6bee8
am: 99e2c216b4

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

Change-Id: Ife14aedec2f2cae4869f3ed0fb02206bcd29bbb7