tree 2a364c1621b34ec80d6852904328d30f84d96df8
parent fc8ae40da05519ed71988e78547fb3c95ee951dc
parent 31a0b956396e417bdbfee97554afb5b52d68a8ba
author Kenny Root <kroot@google.com> 1280360696 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280360696 -0700

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

Merge commit '31a0b956396e417bdbfee97554afb5b52d68a8ba'

* commit '31a0b956396e417bdbfee97554afb5b52d68a8ba':
  Add stdint.h to fix sim-eng