tree 65fb9f8cfb7bc303f3b0e3d9d7f610a64dbf1939
parent e70fbe8b32687d9178e828d6023de599be5431c3
parent d8e8e66220cd71486a3b545096a1cdc298dee5fd
author The Android Open Source Project <initial-contribution@android.com> 1352233229 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233229 -0800

am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'd8e8e66220cd71486a3b545096a1cdc298dee5fd':
  partially implement external display clipping
  Always set vertex alpha when drawing screenshot layers
  SurfaceFlinger: add animation transactions
  ugly, temporary, workaroung for a problem where a binder thread spins forever
  make sure we don't call into the HWC HAL when not needed
  Fix crashes after HDMI disconnect
  Fix issue #7271589: Cannot set Ocean HD live wallpaper
  Revert "Compatibility work around for bad graphics driver dependency."
  only abort when errors happen on the main display
  Check that HWC exists before trying to use it
  Always reset layer acquireFenceFd after commit
  fix a problem where  all hwc layers would have the SKIP flags set
  we were sometimes not setting fences properly
  A vendor ril depends on a native screen shot code.
  Revert "Added display initialization method"
  fix various issues in SF's EventThread
  Revert "SurfaceTexture: inherit from ConsumerBase"
  we were mistakenly optimizing out SF's main transactions in some cases
  Revert "Minimal changes to support multi-display HWC"