Commits
John Huang authored and Android Git Automerger committed c4f535bddacM
am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev * commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed': Get rid of a race in NsdService in stopResolveService and getAddrInfo
Showing diff to955b575dd94