diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 19:19:59 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-22 19:19:59 -0800 |
| commit | d61ade1ddc064d8035e371e22d5fb2d1117a81e1 (patch) | |
| tree | cce78914818c289c8e5f0747aa3816546512bf48 | |
| parent | fd1dd864a896bd6233ee8c75b84d9771148dd9b3 (diff) | |
| parent | 66ed50af6870210ce013a5588a688434a5d48ee9 (diff) | |
| download | system_core-d61ade1ddc064d8035e371e22d5fb2d1117a81e1.zip system_core-d61ade1ddc064d8035e371e22d5fb2d1117a81e1.tar.gz system_core-d61ade1ddc064d8035e371e22d5fb2d1117a81e1.tar.bz2 | |
am 66ed50af: Merge commit \'536dea9d61a032e64bbe584a97463c6638ead009\' into HEAD
* commit '66ed50af6870210ce013a5588a688434a5d48ee9':
| -rw-r--r-- | libsysutils/src/NetlinkEvent.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index 9f2606c..34f2016 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -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) { |