| commit | 6099a84f14804d741f0574c0c211b507d2ae21ae | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Mar 18 19:33:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 19:33:35 2014 +0000 |
| tree | d5ffd72e7185d7b8f82b96053c63be347e1171da | |
| parent | 1bd53e59558f7973a038f4b0d5c78a7fdfa45f91 [diff] | |
| parent | 2521d0d23a151c8689125dc119d80fa86a52dbfb [diff] |
am 2521d0d2: am 5a4183f3: am 267afcde: Merge "HACK: disable emulator on x86_64" * commit '2521d0d23a151c8689125dc119d80fa86a52dbfb': HACK: disable emulator on x86_64