am 22580b83: Merge "Fix potential npe"
am 22580b83: Merge "Fix potential npe"

* commit '22580b83f18b572707ea47f99cb9016f067b89f8':
  Fix potential npe

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