tree 606bc32c0196a0c9036aac5d1d5e71fc4f9db0ac
parent c3a8af84cdf7a2fbdf1c8791d8b77ff82461bf66
parent 72ca07d842358b3cbce70ea3c7a61f98ef3fd6bd
author Mathias Agopian <mathias@google.com> 1281650970 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281650970 -0700

am b7d1be01: Merge "Fix a couple issues with the new hwcomposer HAL" into gingerbread

Merge commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732' into gingerbread-plus-aosp

* commit 'b7d1be01ae44428b947823fc48c1c126dcaa9732':
  Fix a couple issues with the new hwcomposer HAL