From: Christopher Ferris <cferris@google.com>
Date: Sat, 12 Jul 2014 02:06:18 +0000 (+0000)
Subject: am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build."
X-Git-Tag: android-x86-6.0-r1~3111
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2dd4813d26665abc34217e78008e0572b4cb6c59;p=android-x86%2Fart.git

am 7f0ec9ac: am bfe9d08e: Merge "Fix mac build."

* commit '7f0ec9ac316a06b6c0b0a3966973affc92fcaafd':
  Fix mac build.
---

2dd4813d26665abc34217e78008e0572b4cb6c59