OSDN Git Service

Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev
authorErik Kline <ek@google.com>
Fri, 6 Oct 2017 07:35:06 +0000 (07:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Oct 2017 07:35:06 +0000 (07:35 +0000)
commit18092bbd5491e22b1821a42f19d54a2efa14b48a
tree1fd5f4ff34c6ff76f26aee5084693d14e69518eb
parent8cb8bdf6573b71d8466c43097fc10a45434322d5
parent9dfbb0ead958de9990dc04782bec343f0bdccfcf
Merge "Log NAT update descriptions when receiving netlink errors" into oc-mr1-dev
am: 9dfbb0ead9

Change-Id: Ia1f0b97f89a9848a64099d01184fcbc2056a1b34