| commit | b3f2dac1e07e43a57227e39f00474c82006eba7a | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Thu Apr 03 01:41:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 03 01:41:16 2014 +0000 |
| tree | 24a4eef6929ff6cdada36fc4e78c14b5373ddd25 | |
| parent | 9871d2e270781e3254d9b1b82d7e1e6a949172a3 [diff] | |
| parent | 0fd37501c4610783c53a6f8d4000ba7a230f61df [diff] |
am 0fd37501: am f518e838: am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" * commit '0fd37501c4610783c53a6f8d4000ba7a230f61df': Revert "HACK: disable emulator on x86_64"