From: Narayan Kamath <narayan@google.com>
Date: Fri, 30 May 2014 11:08:38 +0000 (+0000)
Subject: Merge "Fix build."
X-Git-Tag: android-x86-7.1-r1~889^2~3936^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d87ca14e850d6cc029419fef41f9212907bda2bf;p=android-x86%2Fart.git

Merge "Fix build."
---

d87ca14e850d6cc029419fef41f9212907bda2bf