tree 2366643d0483237afe4a9067796f3e4cbebccb37
parent 2cfa317c015015495ae7e0679a9ac06409a09ab7
parent ee676317b0d5b98968b8dc99d34b2ec0e60180ab
author Lorenzo Colitti <lorenzo@google.com> 1385082102 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385082102 -0800

am ee676317: am a0b3fef0: Merge "Get rid of an infinite loop in NetlinkEvent.cpp."

* commit 'ee676317b0d5b98968b8dc99d34b2ec0e60180ab':
  Get rid of an infinite loop in NetlinkEvent.cpp.