tree 5d20c854093e240b22761993abd1c25bc395709d
parent c208cdd402d767228a34074d589c6368cc656b7d
parent 92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b
author Mathias Agopian <mathias@google.com> 1353367416 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353367416 -0800

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

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