tree 20d784ba4490b67411dd170d56a435d52a2689ff
parent ea4b1a8600e65d487af7528baa31deabb4db020a
parent f9e275b0c785aa8ed83606e5b98f37d2050a528e
author The Android Open Source Project <initial-contribution@android.com> 1273098000 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273098000 -0700

am f9e275b0: merge from open-source master

Merge commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e' into kraken

* commit 'f9e275b0c785aa8ed83606e5b98f37d2050a528e':
  Add support for x86 VirtualBox Emulation