tree 7b588646694031d49c68a3c3b224aaa8b6d19fce
parent 1bd78d7e8d18b9e7f5811c2598f676c36929600a
parent 604fa813ba2774732eec4fb0cbe5f024fde624e4
author Avery Pennarun <apenwarr@gmail.com> 1369887122 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1369887139 -0400

Merge remote-tracking branch 'origin/prism_dev'

* origin/prism_dev:
  Add vendor/google/prism
  Add toolchains/kvm.

Change-Id: Ic9d557f456d51fd1c891caf291637ba402e36a47