| commit | 5a4183f3916f2666edfa4a6f1d0f4f7da07cd52e | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Mar 18 12:25:45 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 12:25:45 2014 -0700 |
| tree | 90bec7943aedcee8f8a486dc3e9f3fcc504bfe24 | |
| parent | 5462f7f953915bd345a58b17977e79e6405b56d0 [diff] | |
| parent | 267afcdefe3a6da9b72a9c70d238abb00be69949 [diff] |
am 267afcde: Merge "HACK: disable emulator on x86_64" * commit '267afcdefe3a6da9b72a9c70d238abb00be69949': HACK: disable emulator on x86_64