am 5121e8c1: am ceddfcbf: am b1f6aebb: Merge "Fix Bitmap#sameAs NPE" into mnc-dev
am 5121e8c1: am ceddfcbf: am b1f6aebb: Merge "Fix Bitmap#sameAs NPE" into mnc-dev

* commit '5121e8c19f7ad521eddddc077a50c0bf07e2bef6':
  Fix Bitmap#sameAs 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