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

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