tree 961bdd0860db07ef2f26025527d144c979c93cc2
parent 741df2bd6f7e1fb0f2ef1194d7cf1325d327d5a4
parent 53835e97845edf78d513010ae4faa8fc467f0a6c
author Jean-Baptiste Queru <jbq@google.com> 1343948858 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343948858 -0700

am 53835e97: Merge "OMAP4:Panda: Use old hwcomposer API version for panda"

* commit '53835e97845edf78d513010ae4faa8fc467f0a6c':
  OMAP4:Panda: Use old hwcomposer API version for panda