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

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

Change-Id: Ie0ac8eb6605e1ccadb1b572c74fbbb0e5c6dcd21
---

4b9f3666f095b904194a0d0fb53629e039a934cc