tree 4f1fcc197b7e2bd8c3485056985a0ea7a37fdc6c
parent fe9e5f31bc6fa61d6e7e66697c8a29d295bdddfa
parent 136c4f98b438ace567a50773109fba98156915ee
author Mark Chien <markchien@google.com> 1596000060 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596000060 +0000

Merge "Always stop dhcp server even it is obsolete" am: 0ae446b50d am: d2ca7e8b1e am: 136c4f98b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370217

Change-Id: Id45ad3c4bcc90fc3b8355428f8b5d131b220470e