| commit | a6f2ecd2c05b022a2a8334b90af28ccd33fd61ed | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon May 06 16:20:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 06 16:20:30 2013 -0700 |
| tree | 84089366f7e7f890ff75c10eca6468cd5a84bd65 | |
| parent | f7c56ef9dd0605a37de7ca4e5e40070f6d7f0b54 [diff] | |
| parent | 7aa7bb4dfb01e3d32ad040eff8b35245a8bf2292 [diff] |
am 8c04cd04: am 341666c4: Merge "Fix sync problem in NsdManager" into jb-mr2-dev * commit '8c04cd041dfc96ef4af662d50aad63d998314d27': Fix sync problem in NsdManager