| commit | b5169b4d75e1e6dc4f59edca35c53ec384d174a4 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Mar 18 19:29:01 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 19:29:01 2014 +0000 |
| tree | 48c04c14faa436ee150e155a7be91dbd750bbb2d | |
| parent | 882438698735696f3eb69626aae2822fccc30294 [diff] | |
| parent | 5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e [diff] |
am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64" * commit '5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e': HACK: disable emulator on x86_64