tree 2ad02cea46c652db7cfe6550ec22ed7a9c3c7088
parent 04178e1cab7317471e329cb0e0000415637a6079
parent 0480b898713f17ab9fd89e88637403c51fbca30b
author Andrew Hsieh <andrewhsieh@google.com> 1333378684 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333378684 -0700

am 0480b898: am 26f8b539: Merge "ndk: minor update to <netinet/...> headers."

* commit '0480b898713f17ab9fd89e88637403c51fbca30b':
  ndk: minor update to <netinet/...> headers.