| commit | 4417dad18b7927fd42f88d144f39bbe244a76bb9 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Sat Nov 23 12:29:41 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 23 12:29:41 2013 -0800 |
| tree | cfd323efc64dde581f5b73e5b0a069929e93c73e | |
| parent | fabe8716f81ec419ec854799d0a63c444e91edd3 [diff] | |
| parent | d61ade1ddc064d8035e371e22d5fb2d1117a81e1 [diff] |
am d61ade1d: am 66ed50af: Merge commit \'536dea9d61a032e64bbe584a97463c6638ead009\' into HEAD * commit 'd61ade1ddc064d8035e371e22d5fb2d1117a81e1':
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 @@ } /* +<<<<<<< HEAD * Parse a RTM_NEWNDUSEROPT message. */ bool NetlinkEvent::parseNdUserOptMessage(struct nduseroptmsg *msg, int len) {