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

* commit '892ac4155a7e2f2c824ee9898d4c5cef4bbe1afc':
  (DO NOT MERGE) SurfaceFlinger: fix isOpaque check in lockPageFlip