Jeff Sharkey a5d7f82fec Merge "Match network roaming state to avoid wtf()." ...

am: 32e8144344

Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515

2017-12-05 01:11:53 +00:00

..

core/java/com/android/server

Merge "Match network roaming state to avoid wtf()."

2017-12-05 01:11:53 +00:00

net/java/android/net

Clarify some IpManager/ApfFilter debugging output.

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