tree a734b89a074fc6741e70793518629ab04f0f150f
parent 955b575dd94370f618f6b6424d60c1aa9dc34c14
parent 299e011ebd7ce9593c203ecfc9f5eed45360a5ed
author John Huang <jsh@google.com> 1384373656 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384373656 -0800

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