John Huang 3803ea0892 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

2013-11-13 12:19:53 -08:00

..

common_time

…

input

resolved conflicts for merge of d6288751 to master

2013-11-12 17:06:53 -08:00

java

am c4f535bd: am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev

2013-11-13 12:19:53 -08:00

jni

…

tests/servicestests

Minor cleanups to NetdCallbackReceiver.onEvent.

2013-11-04 18:30:20 +09:00