commit | d2e05896d419f8afcba28e8079bda15bb5ac177d | [log] [tgz] |
---|---|---|
author | Remi NGUYEN VAN <reminv@google.com> | Fri Feb 04 12:52:20 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 04 12:52:20 2022 +0000 |
tree | 8ce7cadef0dbdbc1a6eb2ec12eb9a9bd55e81a91 | |
parent | 1b53c09eb5e922d262fcb385cb58e28b2f6b6755 [diff] | |
parent | 7865fe3fc318abb2b8b14ace7529a5435e2008a8 [diff] |
Merge changes from topic "nsd_serviceinfo_network" am: bf13de3b19 am: 902c1d6f8e am: 7865fe3fc3 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1944534 Change-Id: If94a0b81a309fd39165f1e8005103d8a1ab6e01f