am 6ba3ff72: Merge "SurfaceFlinger: fix isOpaque check in lockPageFlip"
am 6ba3ff72: Merge "SurfaceFlinger: fix isOpaque check in lockPageFlip"

* commit '6ba3ff724b73afe3de4d01d57656273e6fead1e0':
  SurfaceFlinger: fix isOpaque check in lockPageFlip

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base