From: Andreas Gampe <agampe@google.com>
Date: Thu, 31 Jul 2014 06:24:06 +0000 (+0000)
Subject: Merge "ART: Build fix"
X-Git-Tag: android-x86-6.0-r1~145^2~2441^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=36b111c7d3d635e262114dabde4c26952c7dcbe6;p=android-x86%2Fart.git

Merge "ART: Build fix"
---

36b111c7d3d635e262114dabde4c26952c7dcbe6