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)
commit5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e
tree90bec7943aedcee8f8a486dc3e9f3fcc504bfe24
parent5462f7f953915bd345a58b17977e79e6405b56d0
parent267afcdefe3a6da9b72a9c70d238abb00be69949
am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '267afcdefe3a6da9b72a9c70d238abb00be69949':
  HACK: disable emulator on x86_64