From: Greg Hackmann <ghackmann@google.com>
Date: Thu, 3 Apr 2014 01:49:30 +0000 (+0000)
Subject: am b3f2dac1: am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable... 
X-Git-Tag: android-x86-6.0-r1~1583^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=40a198c6;p=android-x86%2Fbuild.git

am b3f2dac1: am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""

* commit 'b3f2dac1e07e43a57227e39f00474c82006eba7a':
  Revert "HACK: disable emulator on x86_64"
---

40a198c6f3ed230c7b89c8df5d58909705986129