tree 15dfd365a1988c80d83bacc2b1aab0d9e83d7c13
parent 0ee9aaf91b2ba3925920dabccd42f4e3e8a71757
parent 5baa9f74cae361278cb154ac6c119ff3f5b222a7
author Remi NGUYEN VAN <reminv@google.com> 1643979242 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643979242 +0000

Merge "Add APIs for discover/resolve on specific networks" am: d61719c422 am: 5baa9f74ca

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944726

Change-Id: Iad6b5fab7501ec18dc3946194f1a26af5fd7b627