tree 1c5affe501918406fae744bdf830afc270723aed
parent e149855a816c98149a95725139ae66f193049ddd
parent 1b64957a7952738b02d437ffe3d4de45127a160c
author Nick Kralevich <nnk@google.com> 1361554932 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361554932 -0800

am 1b64957a: Merge "init.rc: allow IPPROTO_ICMP support"

* commit '1b64957a7952738b02d437ffe3d4de45127a160c':
  init.rc: allow IPPROTO_ICMP support