| commit | 6f43bb0fbcbac853d624ae80eedb639409eddeba | [log] [tgz] |
|---|---|---|
| author | John Huang <jsh@google.com> | Wed Nov 13 12:07:10 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 13 12:07:10 2013 -0800 |
| tree | ef1562bc585184a187458c3cdffa3fce273ee8c5 | |
| parent | e39a89bab4d27eb89cc35d1209479dbba6dee3d0 [diff] | |
| parent | e179c18c8d5c2fb102a44619d9c3190a9326952a [diff] |
am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev * commit '54ca906604c2ff0a58274e5d1b66cdba4df8c3d8': Get rid of a race in NsdService in stopResolveService and getAddrInfo