Erik Kline 110b875969 Merge "Prefer default Internet network for upstream tethering." ...

am: 2b39d6d2a0

Change-Id: I0990d077627aed71b03e7aa40a8acc460448a774

2018-06-25 06:24:22 -07:00

..

core/java/com/android/server

Merge "Prefer default Internet network for upstream tethering."

2018-06-25 06:24:22 -07:00

net/java/android/net

apf: Add counters for dropped / passed packets

2018-05-15 14:21:54 +09:00