tree 3cbaba534e2dad16b95ba75ef9708417a7c23313
parent 8fc1811242f98370c1e5882f7a7f8135198cd242
parent 9de6872b4c0ab35e4466fc05f36e0b9801e06a47
author David 'Digit' Turner <digit@google.com> 1285259367 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285259367 -0700

am 9de6872b: am 1f0003f5: Merge "Unify NDK platform headers." into gingerbread

Merge commit '9de6872b4c0ab35e4466fc05f36e0b9801e06a47'

* commit '9de6872b4c0ab35e4466fc05f36e0b9801e06a47':
  Unify NDK platform headers.