diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:28:10 -0800 |
|---|---|---|
| committer | Conley Owens <cco3@android.com> | 2013-11-22 13:44:43 -0800 |
| commit | 66ed50af6870210ce013a5588a688434a5d48ee9 (patch) | |
| tree | a879f3ea31083496d0efe491bc187b6e0ebada39 /libsysutils | |
| parent | dd2ac3de625e6c0328a0f70530d8ade0d2151bfc (diff) | |
| parent | 536dea9d61a032e64bbe584a97463c6638ead009 (diff) | |
| download | system_core-66ed50af6870210ce013a5588a688434a5d48ee9.zip system_core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.gz system_core-66ed50af6870210ce013a5588a688434a5d48ee9.tar.bz2 | |
Merge commit '536dea9d61a032e64bbe584a97463c6638ead009' into HEAD
Change-Id: I5c469a4b738629d99d721cad7ded02d6c35f56d5
Diffstat (limited to 'libsysutils')
| -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) { |