Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"

This commit is contained in:
Bill Yi
2020-03-05 18:27:30 +00:00
committed by Gerrit Code Review

View File

@@ -49,8 +49,8 @@ import java.util.concurrent.CountDownLatch;
* limited to a local network over Multicast DNS. DNS service discovery is described at * limited to a local network over Multicast DNS. DNS service discovery is described at
* http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt * http://files.dns-sd.org/draft-cheshire-dnsext-dns-sd.txt
* *
* <p> The API is asynchronous and responses to requests from an application are on listener * <p> The API is asynchronous, and responses to requests from an application are on listener
* callbacks on a seperate internal thread. * callbacks on a separate internal thread.
* *
* <p> There are three main operations the API supports - registration, discovery and resolution. * <p> There are three main operations the API supports - registration, discovery and resolution.
* <pre> * <pre>