OSDN Git Service

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


Trivial merge