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

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