tree 1fd5f4ff34c6ff76f26aee5084693d14e69518eb
parent 8cb8bdf6573b71d8466c43097fc10a45434322d5
parent 9dfbb0ead958de9990dc04782bec343f0bdccfcf
author Erik Kline <ek@google.com> 1507275306 +0000
committer android-build-merger <android-build-merger@google.com> 1507275306 +0000

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

Change-Id: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34