Chalard Jean 2f8889613d Resolve merge conflicts of aedd67b6cc to master ...

Test: this is the exact code these changes were meant to give
      without conflict had the auto-merger not squashed them
      together before it tried to merge them. It was tested on
      master in this state.

Change-Id: I5cbde17fb6016e5e6b5d0b04c8f41858d708ef4a

2018-01-24 15:59:26 +09:00

..

core/java/com/android/server

Resolve merge conflicts of aedd67b6cc to master

2018-01-24 15:59:26 +09:00

net/java/android/net

Clarify some IpManager/ApfFilter debugging output.

2017-04-26 17:17:04 +09:00