OSDN Git Service

am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddr...
authorJohn Huang <jsh@google.com>
Wed, 13 Nov 2013 20:07:10 +0000 (12:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Nov 2013 20:07:10 +0000 (12:07 -0800)
commit299e011ebd7ce9593c203ecfc9f5eed45360a5ed
tree2ed2dcbb00129b012de014cec940d300a139ebc5
parentc95bfc4dc8eb453999dedbb9a437713bd41eacb4
parent54ca906604c2ff0a58274e5d1b66cdba4df8c3d8
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