| commit | 78d9bec5cb4faf0c0f6b5f73d2b42d398ad62e01 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Tue Apr 22 18:45:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 22 18:45:51 2014 +0000 |
| tree | 09e5513864c8a06d1ca4a2bfe333bf95cf6ba81e | |
| parent | ada19782721bdb100555ffadc4f5c8b6500daab5 [diff] | |
| parent | 2b96d6ae782188dadcb08523e44b8c94bd7626d3 [diff] |
am 2b96d6ae: resolved conflicts for merge of 77efd7b4 to master * commit '2b96d6ae782188dadcb08523e44b8c94bd7626d3': Make the zygote 64-bit for the x86-64 emulator.