tree c9483dff9d1e42c7f490f3fc933dc830a56080f9
parent bc5aac5d45e5095c1e22bf483553c0dc27945401
parent 7a4cf11eb56beae22c33b5263bc790ef1feb9892
author Kenny Root <kroot@google.com> 1280360496 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280360496 -0700

am 47cf709a: am 8c5d9430: Merge "Add unistd.h for size_t typedef to fix sim-eng" into gingerbread

Merge commit '47cf709aa3c07d2573340187edb5e11ea75824b1'

* commit '47cf709aa3c07d2573340187edb5e11ea75824b1':
  Add unistd.h for size_t typedef to fix sim-eng