From: Colin Cross <ccross@android.com>
Date: Fri, 26 Aug 2016 01:20:39 +0000 (+0000)
Subject: Merge "Fix arm32 build" am: b26918002c am: 971e9f70bf
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=026907d894f481fc984a84ff7c77babc20328b89;p=android-x86%2Fart.git

Merge "Fix arm32 build" am: b26918002c am: 971e9f70bf
am: e51e96acf1

Change-Id: If4a8b2b2476d00b138fbb63b9a48a68e2c7bd35d
---

026907d894f481fc984a84ff7c77babc20328b89