am b102fb8e: Merge "Fix media scan NPE"
am b102fb8e: Merge "Fix media scan NPE"

* commit 'b102fb8ed5acdfa5f47e60b7d9fef7b5d74bd9fd':
  Fix media scan 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