tree f9bd52b201736ba318ded2945ceb9123aed3c022
parent 52219a68a83c47f8c5b93038f57f3f130e7d0823
parent 97ca48e7f4ac8d3842f74f92b8f40d0e74733f38
author Bruce Beare <brucex.j.beare@intel.com> 1272928491 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272928491 -0700

am 97ca48e7: generic_x86 support

Merge commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38' into kraken

* commit '97ca48e7f4ac8d3842f74f92b8f40d0e74733f38':
  generic_x86 support