From: Nicolas Geoffray <ngeoffray@google.com>
Date: Sat, 12 Jul 2014 01:42:14 +0000 (+0000)
Subject: am bd6b5dd3: Merge "Revert "Fix mac build""
X-Git-Tag: android-x86-6.0-r1~145^2~2807
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=05eb2b372a910bf684b71c5e8da254e22706d420;p=android-x86%2Fart.git

am bd6b5dd3: Merge "Revert "Fix mac build""

* commit 'bd6b5dd3ce0f4d5454334d4848a97b00120b235e':
  Revert "Fix mac build"
---

05eb2b372a910bf684b71c5e8da254e22706d420