| commit | f518e8380cc5d4e1a25ca5fad161a7cd7e7e78dd | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Wed Apr 02 22:58:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 02 22:58:07 2014 +0000 |
| tree | 59520561618de601aa09b18ad586505bfb9a214e | |
| parent | 578f7ec487c2c00581cdc9807d0d24883ba4406a [diff] | |
| parent | f17508760898e0debeb4ae7ff6455d664577c647 [diff] |
am f1750876: Merge "Revert "HACK: disable emulator on x86_64"" * commit 'f17508760898e0debeb4ae7ff6455d664577c647': Revert "HACK: disable emulator on x86_64"