am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"
am 4ba4caed: Merge "Fix SkBitmap::fPixels not being locked correctly"

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