am 892ac415: (-s ours) Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque...
am 892ac415: (-s ours) Merge "(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip" into ics-factoryrom
* commit '892ac415':
(DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip