tree b0471ba448dccf28976ce3fbee6e1c801eca26c6
parent 41b92b008e03be95db938e0238ccb9373c2aaadc
parent 4038724a536c990859866489195add7ed537006b
author John Huang <jsh@google.com> 1384370039 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1384370040 +0000

Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev