OSDN Git Service

am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator...
authorGreg Hackmann <ghackmann@google.com>
Tue, 18 Mar 2014 20:53:00 +0000 (20:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Mar 2014 20:53:00 +0000 (20:53 +0000)
* commit '6099a84f14804d741f0574c0c211b507d2ae21ae':
  HACK: disable emulator on x86_64


Trivial merge