Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4417dad1 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am d61ade1d: am 66ed50af: Merge commit \'536dea9d\' into HEAD 

* commit 'd61ade1d':
parents fabe8716 d61ade1d

libsysutils/src/NetlinkEvent.cpp

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ bool NetlinkEvent::parseIfAddrMessage(int type, struct ifaddrmsg *ifaddr, 
}



/*

<<<<<<< HEAD

 * Parse a RTM_NEWNDUSEROPT message.

 */

bool NetlinkEvent::parseNdUserOptMessage(struct nduseroptmsg *msg, int len) {