OSDN Git Service

Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into...
authorJohn Huang <jsh@google.com>
Wed, 13 Nov 2013 19:13:59 +0000 (19:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Nov 2013 19:14:00 +0000 (19:14 +0000)

Trivial merge