tree 1d70e49abd6bdde825da4461f6eac36fd2816fad
parent d82ad1be4ed4040b9488f88832cfe49b76d7081f
parent 64a01b66b7b36d5946f4d3fc857516beb9c81120
author Jayachandran Chinnakkannu <jayachandranc@google.com> 1488588773 +0000
committer android-build-merger <android-build-merger@google.com> 1488588773 +0000

Merge "Fix the missing nlmsg_read for netlink_xfrm_socket" am: 1965e156d4 am: fe0f25f3dd
am: 64a01b66b7

Change-Id: I4398775a2acf00183d8967fb144029ec9cc814c7