tree c4ce7458982c2c818168e4ce22f080c2c4d3e5d6
parent eeed89db2546625b11bad0e8f812792c02f3cb65
parent 9d26d64c356817e2f320e8aee958012ee6c5bed5
author Andrew Hsieh <andrewhsieh@google.com> 1336364769 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336364769 -0700

am 9d26d64c: Merge "Emulator64-mips segfaults, disable it for now."

* commit '9d26d64c356817e2f320e8aee958012ee6c5bed5':
  Emulator64-mips segfaults, disable it for now.