tree 6a633e74cd7648f1258d3d3613305c67a6ac744a
parent 26619dfbb8c1f470407745837818b2654eb6a28f
parent 4e5f0d41f6e239730bbd70b9a8512949bdfe01d9
author JP Abgrall <jpa@google.com> 1311783876 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1311783876 -0700

am 4e5f0d41: (-s ours) am 821bea02: Merge "DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto." into honeycomb-LTE

* commit '4e5f0d41f6e239730bbd70b9a8512949bdfe01d9':
  DO NOT MERGE: libc: enable IPTOS_MINCOST, fixup gethostbyaddr() proto.