tree fa4dfded5b74c85c5739f74acbe02e058d1a4730
parent 35976ca0ff4a6b86c6298f840396927b16c27d3d
parent 18092bbd5491e22b1821a42f19d54a2efa14b48a
author Erik Kline <ek@google.com> 1507276064 +0000
committer android-build-merger <android-build-merger@google.com> 1507276064 +0000

Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev am: 9dfbb0ead9
am: 18092bbd54

Change-Id: I426b0a0545d56aba7924c416799b37731e7e4b18