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

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