OSDN Git Service

am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
authorGreg Hackmann <ghackmann@google.com>
Thu, 3 Apr 2014 01:41:16 +0000 (01:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 01:41:16 +0000 (01:41 +0000)
* commit '0fd37501c4610783c53a6f8d4000ba7a230f61df':
  Revert "HACK: disable emulator on x86_64"


Trivial merge