| commit | c42a444cfc5fac0b87322857673410aee5eccee4 | [log] [tgz] |
|---|---|---|
| author | John Huang <jsh@google.com> | Wed Nov 13 12:14:16 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 12:14:16 2013 -0800 |
| tree | 02cbf8421d6b998bf76e2b5b75cde48fc7904f41 | |
| parent | f74428a70dffe7723e2e7395c8f23ba3c6fe1a38 [diff] | |
| parent | 6f43bb0fbcbac853d624ae80eedb639409eddeba [diff] |
am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev * commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed': Get rid of a race in NsdService in stopResolveService and getAddrInfo