OSDN Git Service

Merge "Log NAT update descriptions when receiving netlink errors" am: 3506aaf992
authorErik Kline <ek@google.com>
Fri, 6 Oct 2017 09:34:49 +0000 (09:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Oct 2017 09:34:49 +0000 (09:34 +0000)
commit35d9ddf06deb80a8d133f42c25a22fc220013be0
tree0669dfd9a93039b324d7b554ec267270ed88eae6
parent5b2afc8dab1ee59f2be45b2c4cd6e49c2525a363
parentcb2860362be8ebd83f68e4ac5303a0d518e25037
Merge "Log NAT update descriptions when receiving netlink errors" am: 3506aaf992
am: cb2860362b

Change-Id: I9841bc9640c203a4b7d6698eddedbee7b8b24a8a