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)
commit2521d0d23a151c8689125dc119d80fa86a52dbfb
treed5ffd72e7185d7b8f82b96053c63be347e1171da
parent5968350855ea7534aa13cbafa3c8004918407130
parent5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e
am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64"

* commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e':
  HACK: disable emulator on x86_64