am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show...
am d0441f92: (-s ours) Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread
* commit 'd0441f92':
fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)