tree b63fd307c08eaa17450856244c20988785428299
parent 24f7cd982abb4c2f30c97c5a9f6a33e72a5f3502
parent 3f6c18a19de6b4c4756733535e51fa5425687c98
author Elliott Hughes <enh@google.com> 1348700965 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348700965 -0700

am 3f6c18a1: am 7f728177: Merge "__unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form."

* commit '3f6c18a19de6b4c4756733535e51fa5425687c98':
  __unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form.