From: Andreas Gampe <agampe@google.com>
Date: Tue, 23 Jun 2015 23:03:07 +0000 (+0000)
Subject: Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"
X-Git-Tag: android-x86-7.1-r1~889^2~907
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f327bfb;p=android-x86%2Fart.git

Merge "ART: Follow-up to 507cc6f83bf6379728f2dd20391f2ed5fbfe6371"
---

6f327bfb6c9c45578794ff8ae3790189968af751