From: Narayan Kamath <narayan@google.com>
Date: Mon, 18 May 2015 12:40:32 +0000 (+0000)
Subject: Merge "Fix libcore buildbot failure."
X-Git-Tag: android-x86-7.1-r1~889^2~1242
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ee371e2324d979ff7d11ac58b8201f29888c682;p=android-x86%2Fart.git

Merge "Fix libcore buildbot failure."
---

9ee371e2324d979ff7d11ac58b8201f29888c682