tree c73ca0e812788dc73dfb5e8cebae5bb053799846
parent 1d3612f11cb0a56062059dad4643657750c23aab
parent 3e095b251503d71bea04d6b707e8188cd30034e2
author Mathias Agopian <mathias@google.com> 1353367324 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353367324 -0800

am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]

* commit '3e095b251503d71bea04d6b707e8188cd30034e2':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]