am 7ecc6b72: am 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"
am 7ecc6b72: am 71fa6862: Merge "Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray"

* commit '7ecc6b721e5da0cc3a52dc14bdfd8d1308db84bc':
  Fix NPE in Bundle#hasFileDescriptor on null-valued SparseArray

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