tree 65fb9f8cfb7bc303f3b0e3d9d7f610a64dbf1939
parent 742801c625ecb09fbe14e717fa5d580b3957ed4a
parent 02b95105754b1859a97e234b79f41489a4677c20
author Mathias Agopian <mathias@google.com> 1352168156 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352168156 -0800

am 02b95105: fix transitions from hwc to GLES composition

* commit '02b95105754b1859a97e234b79f41489a4677c20':
  fix transitions from hwc to GLES composition