tree 44ffa08b51aa298fc7f8d76123485c3ba4d27552
parent 15a75decbffaf4d79ac1ef240df6640089a2a7c1
parent b52d7e7b6ebfac476a1f9506a1a8b2999797ef15
author Calin Juravle <calin@google.com> 1403613161 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403613161 +0000

am b52d7e7b: am 63fa660b: Merge "Prefix cmsg_nxthdr with "__"."

* commit 'b52d7e7b6ebfac476a1f9506a1a8b2999797ef15':
  Prefix cmsg_nxthdr with "__".