commit | 8c04cd041dfc96ef4af662d50aad63d998314d27 | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Mon May 06 11:12:02 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 06 11:12:02 2013 -0700 |
tree | 66fa45180a9383f85a87dac3d8e31126aadad187 | |
parent | 664f785e2c8697aa31fa69b9a109c09a99a2d50b [diff] | |
parent | 341666c40d222145f7dfd44bdbed48590c4dc5da [diff] |
am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev * commit '341666c40d222145f7dfd44bdbed48590c4dc5da': Fix sync problem in NsdManager