| commit | c217d7b7c1aa1ec553c6bb97b7534df0aa20433e | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Mar 18 20:53:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 20:53:00 2014 +0000 |
| tree | 3a5fa78d55dae8ee83c3d7e834f8b30507299514 | |
| parent | 145374e097034b886fcb040b0b1aef381304efb4 [diff] | |
| parent | 6099a84f14804d741f0574c0c211b507d2ae21ae [diff] |
am 6099a84f: am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64" * commit '6099a84f14804d741f0574c0c211b507d2ae21ae': HACK: disable emulator on x86_64