OSDN Git Service

am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""
authorGreg Hackmann <ghackmann@google.com>
Wed, 2 Apr 2014 23:04:57 +0000 (23:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Apr 2014 23:04:57 +0000 (23:04 +0000)
commit0fd37501c4610783c53a6f8d4000ba7a230f61df
tree7864ea72846ec4d85d56b300e638ef0a025ef500
parent0396b10235ece43be797e48673ec05c4cf4c74d7
parentf518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd
am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64""

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