From: Colin Cross <ccross@android.com>
Date: Mon, 22 Aug 2016 20:31:06 +0000 (+0000)
Subject: Merge "Add define needed by new vixl" am: 621a27ed21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3ad64610776bc777f9c0682ddbff5a9911b26d3d;p=android-x86%2Fart.git

Merge "Add define needed by new vixl" am: 621a27ed21
am: 57de217dac

Change-Id: Iac9a94aa09eacc2cbbc176de609ffb310326a36c
---

3ad64610776bc777f9c0682ddbff5a9911b26d3d