Skip to content
Commit af15f857 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Log NAT update descriptions when receiving netlink errors" am: 3506aaf9 am: cb286036 

am: 35d9ddf0  -s ours

Change-Id: I4a971e6010049e8afc44d4c122405ec09f892f89
parents 18092bbd 35d9ddf0
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment