OSDN Git Service

Merge "HACK: disable emulator on x86_64"
authorGreg Hackmann <ghackmann@google.com>
Tue, 18 Mar 2014 19:21:48 +0000 (19:21 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 18 Mar 2014 19:21:49 +0000 (19:21 +0000)

Trivial merge