am 921113d5: Merge "use the bitmap stride when encoding a screenshot as PNG" into jb-mr2-dev
am 921113d5: Merge "use the bitmap stride when encoding a screenshot as PNG" into jb-mr2-dev

* commit '921113d501b0c7136a0cbc6950f9e90ca1543277':
  use the bitmap stride when encoding a screenshot as PNG

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