tree afa88069238fa6c4c660b6d4349b85182b034eac
parent 127fbb7943e25e8b4c19fcb0cc3a4ae8de67a42d
parent e9ba52c9c30382c8a0c43a5a75676d5ad04dfb49
author Mathias Agopian <mathias@google.com> 1281569301 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281569301 -0700

am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread

Merge commit '90dc48b17f673b7e334e3254ea633450f994226c' into gingerbread-plus-aosp

* commit '90dc48b17f673b7e334e3254ea633450f994226c':
  call into hwcomposer HAL when present