OSDN Git Service

am b3f2dac1: am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable...
authorGreg Hackmann <ghackmann@google.com>
Thu, 3 Apr 2014 01:49:30 +0000 (01:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 01:49:30 +0000 (01:49 +0000)
commit40a198c6f3ed230c7b89c8df5d58909705986129
tree48a700cea7ea40097e117bd646ef7c1708da22d4
parent3a316e63f2998be2b44cdbb15acc65d8d80d813a
parentb3f2dac1e07e43a57227e39f00474c82006eba7a
am b3f2dac1: am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""

* commit 'b3f2dac1e07e43a57227e39f00474c82006eba7a':
  Revert "HACK: disable emulator on x86_64"