openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 66ed50af: Merge commit \'536dea9d61a032e64bbe584a97463c6638ead009\' into HEAD 

* commit '66ed50af6870210ce013a5588a688434a5d48ee9':
This commit is contained in:
The Android Open Source Project 2013-11-22 19:19:59 -08:00 committed by Android Git Automerger
parent fd1dd864a8 66ed50af68
commit d61ade1ddc
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libsysutils/src/NetlinkEvent.cpp
View File

@ -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) {