From: Greg Hackmann <ghackmann@google.com>
Date: Tue, 18 Mar 2014 21:01:17 +0000 (-0700)
Subject: am c217d7b7: am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable... 
X-Git-Tag: android-x86-6.0-r1~1634^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1b4961661b19ebb9ca619467a17617ba34889ea9;p=android-x86%2Fbuild.git

am c217d7b7: am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit 'c217d7b7c1aa1ec553c6bb97b7534df0aa20433e':
  HACK: disable emulator on x86_64
---

1b4961661b19ebb9ca619467a17617ba34889ea9