tree 64f99cc603a6012fdf73a98023f607e564be3cdc
parent 984f8fcc51711f95414cf1a7a0ff97fcd4b98c9c
parent 2c500e21bd63e8081fa57a8040a3e01e7647808f
author Luke Huang <huangluke@google.com> 1632888628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1632888628 +0000

Merge "Keep the native mdns daemon alive for pre-S application" am: 2adba7dd4a am: 2c500e21bd

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

Change-Id: I0312c8abb2eb11d8f788ca915a13ba0f23b5430a