Commits
Robert Greenwalt authored and Android Git Automerger committed 5dd3f51a19eM
am 8c04cd04: am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev * commit '8c04cd041dfc96ef4af662d50aad63d998314d27': Fix sync problem in NsdManager
Showing diff tof3ff4d6d80a