OSDN Git Service

am 2b96d6ae: resolved conflicts for merge of 77efd7b4 to master
authorIan Rogers <irogers@google.com>
Tue, 22 Apr 2014 18:45:51 +0000 (18:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 22 Apr 2014 18:45:51 +0000 (18:45 +0000)
* commit '2b96d6ae782188dadcb08523e44b8c94bd7626d3':
  Make the zygote 64-bit for the x86-64 emulator.


Trivial merge