OSDN Git Service

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


Trivial merge