From: David Brazdil <dbrazdil@google.com>
Date: Thu, 5 Mar 2015 16:10:41 +0000 (+0000)
Subject: am 0529f559: am a80aab6d: Merge "ART: Fix test breakage"
X-Git-Tag: android-x86-6.0-r1~145^2~500
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=514591bd822aa4d0727f8e4fcbf4c77de585768c;p=android-x86%2Fart.git

am 0529f559: am a80aab6d: Merge "ART: Fix test breakage"

* commit '0529f55973eacd3fe8092d3af63e948223709ef7':
  ART: Fix test breakage
---

514591bd822aa4d0727f8e4fcbf4c77de585768c