am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."
am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals."

* commit '9f141fbb786c07ff56324717e1e0747a3cabf23b':
  Fix null check for BaseObj.equals.

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