OSDN Git Service

am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveServic...
authorJohn Huang <jsh@google.com>
Wed, 13 Nov 2013 20:14:16 +0000 (12:14 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Nov 2013 20:14:16 +0000 (12:14 -0800)
commitc4f535bddac2491aa0e354a609fcbf7c49276295
treea734b89a074fc6741e70793518629ab04f0f150f
parent955b575dd94370f618f6b6424d60c1aa9dc34c14
parent299e011ebd7ce9593c203ecfc9f5eed45360a5ed
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