tree a66219476773cf918b5b010961efd5da8258daa3
parent 7fbc851f4dee8924c7a989b873cae5b5b759a95b
parent 5a1137164fc33460113d31ba5b96ce81558280b8
author David 'Digit' Turner <digit@google.com> 1403721993 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403721993 +0000

am 5a113716: Merge "Warn/Panic with x86_64 emulation without CPU acceleration."

* commit '5a1137164fc33460113d31ba5b96ce81558280b8':
  Warn/Panic with x86_64 emulation without CPU acceleration.