Commits
Dave Platt authored and Android Git Automerger committed bf588bda2c4M
am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" * commit 'f08cd8c656c4ea6a8c7bf8bafa3f8de72578ebca': Harden NsdManager against null-dereference crashes
Showing diff to2faf28cf852