OSDN Git Service

Merge "Revert "HACK: disable emulator on x86_64""
authorGreg Hackmann <ghackmann@google.com>
Wed, 2 Apr 2014 22:53:45 +0000 (22:53 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 2 Apr 2014 22:53:45 +0000 (22:53 +0000)

Trivial merge