am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"
am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes"

* commit '7d8262cb554c41892794f23b92e01b52458288bb':
  Harden NsdManager against null-dereference crashes

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