tree d260033630b81a5118fc0ceec0f8aa3bbea52dab
parent a7db1541a5a82d9caa512d02f245a67ad61277fa
parent 60df0c2b83f3ab3ce121e569e7779b6d4796c2d2
author Andrew Hsieh <andrewhsieh@google.com> 1333381060 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333381060 -0700

am 60df0c2b: am 1f52f49c: am 3e7f4c62: Merge "ndk: <sys/cdefs.h> minor update"

* commit '60df0c2b83f3ab3ce121e569e7779b6d4796c2d2':
  ndk: <sys/cdefs.h> minor update