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

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