OSDN Git Service

am c4f535bd: am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in...
authorJohn Huang <jsh@google.com>
Wed, 13 Nov 2013 20:19:53 +0000 (12:19 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 13 Nov 2013 20:19:53 +0000 (12:19 -0800)
commit3803ea08921403bedf062afcc57fb142228d0026
treed7b236089e5147f3d5a498f5b1ba8a3a0675148d
parentc07094c88ddd1ce3f6fda12f7a90b76c1bfe0977
parentc4f535bddac2491aa0e354a609fcbf7c49276295
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