am 913f3c8f: am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"
am 913f3c8f: am 263554ae: am 7d4e52ba: Merge "FIX Null Pointer Exception on dialog cancel"

* commit '913f3c8f17ddfcfe67b8deb054272da29b6cdd6d':
  FIX Null Pointer Exception on dialog cancel

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