Mathew Inwood 6914312812 resolve merge conflicts of daef557352 to pi-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Change-Id: I3d1aeb30b755ca05f32dcd3c46335d1611e0bb50

2018-03-23 16:35:44 +00:00

..

internal

resolve merge conflicts of daef557352 to pi-dev-plus-aosp

2018-03-23 16:35:44 +00:00

server

Add new netd event callback for changes to private DNS validation state.

2018-03-13 22:39:59 +09:00