tree 8df8c4853c447283df0a6781c0e01112addafa67
parent ef03ae17fcbd7474f839cc2fee27a58369cf41dd
parent 69a9d313a91bc0cc1ac4aa98d0abdebdc5f9f9a0
author David 'Digit' Turner <digit@google.com> 1310423802 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310423802 -0700

am 69a9d313: merge intel x86 patches into gingerbread branch

* commit '69a9d313a91bc0cc1ac4aa98d0abdebdc5f9f9a0':
  Fix compile warnings and errors