tree 6ff9c7aebbac3479066e1fec1b69fb1555387f2e
parent 3843858743d7452961d5174e0195ed7ec78d9c9f
parent 89461623ee2b7c0dc4019c43da575c3adf8497ee
author David Turner <digit@android.com> 1401306443 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401306443 +0000

am 89461623: Merge "Allow path to KVM to be overridden by environment." into idea133 automerge: 4ebb7b4

* commit '89461623ee2b7c0dc4019c43da575c3adf8497ee':
  Allow path to KVM to be overridden by environment.