From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 20 Jan 2017 01:20:08 +0000 (+0000)
Subject: Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9a5562312c;p=android-x86%2Fbuild.git

Merge "Support native test prebuilts for X86+ARM builds" am: bf28f5933a am: 4f87826d23
am: b7303cde95

Change-Id: Ie91d984c97c6da2cf99f7e838c14a50d6e6dbd1c
---

9a5562312c04d0a6dfcab6c764f42f5cf86be6a6