tree 9f2546eccfa6e3aba11b4cf5e0aa727a0a377591
parent 7a4cf11eb56beae22c33b5263bc790ef1feb9892
parent 8e8ca37747652095a3a1d8422ad73c79ddd94a1d
author Kenny Root <kroot@google.com> 1280360588 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280360588 -0700

am 3de27d5a: Merge "Add stdint.h to fix sim-eng" into gingerbread

Merge commit '3de27d5a56f4b9e3d76ac71445b33e47c635d207' into gingerbread-plus-aosp

* commit '3de27d5a56f4b9e3d76ac71445b33e47c635d207':
  Add stdint.h to fix sim-eng