diff options
| author | John Huang <jsh@google.com> | 2013-11-13 12:19:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 12:19:53 -0800 |
| commit | 3803ea08921403bedf062afcc57fb142228d0026 (patch) | |
| tree | d7b236089e5147f3d5a498f5b1ba8a3a0675148d /docs/html/sdk/api_diff/11/changes | |
| parent | c07094c88ddd1ce3f6fda12f7a90b76c1bfe0977 (diff) | |
| parent | c4f535bddac2491aa0e354a609fcbf7c49276295 (diff) | |
am c4f535bd: am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev
* commit 'c4f535bddac2491aa0e354a609fcbf7c49276295':
Get rid of a race in NsdService in stopResolveService and getAddrInfo
Diffstat (limited to 'docs/html/sdk/api_diff/11/changes')
0 files changed, 0 insertions, 0 deletions