am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced."
am 88fe4ebc: Merge "NsdService: Clear client info after resolution request is serviced."

* commit '88fe4ebc0b6e0499f247b5d896778dd72304bf9f':
  NsdService: Clear client info after resolution request is serviced.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base