tree f5e68fa326dc7bdefef16cab0b999e38a88a0ee7
parent 3afafd46f3e0c820e3d0a1b13cceddbeea1b5966
parent 3dc94305e4eb243747248b43954c499ddc96638d
author David Turner <digit@android.com> 1312922250 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312922250 -0700

am 3dc94305: am 17a40ffb: am c57fd963: Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"

* commit '3dc94305e4eb243747248b43954c499ddc96638d':
  NDK: x86 header file has incorrect definition for ptrdiff_t