Erik Kline 7ae1277cd3 Merge "Push DNS configuration on network validation" ...

am: b71c6a1b7e

Change-Id: I5907831e5f5f1f3659580cc56e2e081cbe88b1cc

2018-07-03 03:09:16 -07:00

..

core/java/com/android/server

Merge "Push DNS configuration on network validation"

2018-07-03 03:09:16 -07:00

net/java/android/net

apf: Add counters for dropped / passed packets

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