OSDN Git Service

am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
authorGreg Hackmann <ghackmann@google.com>
Wed, 2 Apr 2014 22:58:07 +0000 (22:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 22:58:07 +0000 (22:58 +0000)
* commit 'f17508760898e0debeb4ae7ff6455d664577c647':
  Revert "HACK: disable emulator on x86_64"


Trivial merge