tree 440ed1a05cf69d10f8fa5db7615f5248237bb310
parent 72f2a7af828056fc426d936c1d40cb6bbdbdf7c7
parent af2eefb70146a94dc4ae1d85ffe2b0e5e8f35a69
author Robert Greenwalt <rgreenwalt@google.com> 1367858264 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1367858264 +0000

Merge "Fix sync problem in NsdManager" into jb-mr2-dev