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