OSDN Git Service

am 267afcde: Merge "HACK: disable emulator on x86_64"
authorGreg Hackmann <ghackmann@google.com>
Tue, 18 Mar 2014 19:25:45 +0000 (12:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Mar 2014 19:25:45 +0000 (12:25 -0700)
* commit '267afcdefe3a6da9b72a9c70d238abb00be69949':
  HACK: disable emulator on x86_64


Trivial merge