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

* commit '7f93e7d265509d4ae18f99cbc9a45cca087c4b71':
  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