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