tree 59520561618de601aa09b18ad586505bfb9a214e
parent 578f7ec487c2c00581cdc9807d0d24883ba4406a
parent f17508760898e0debeb4ae7ff6455d664577c647
author Greg Hackmann <ghackmann@google.com> 1396479487 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396479487 +0000

am f1750876: Merge "Revert "HACK: disable emulator on x86_64""

* commit 'f17508760898e0debeb4ae7ff6455d664577c647':
  Revert "HACK: disable emulator on x86_64"