am 3f6c9bae: am 921113d5: Merge "use the bitmap stride when encoding a...
am 3f6c9bae: am 921113d5: Merge "use the bitmap stride when encoding a screenshot as PNG" into jb-mr2-dev
* commit '3f6c9bae':
use the bitmap stride when encoding a screenshot as PNG