am 38f19786: am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
am 38f19786: am 14c0c989: am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"

* commit '38f197863a07cd600b45d752fdfa949d8b2e6fa6':
  Fix SkBitmap::fPixels not being locked correctly

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