am b54c514c: Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev
authorGreg Hackmann <ghackmann@google.com>
Mon, 15 Oct 2012 19:11:48 +0000 (12:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Oct 2012 19:11:48 +0000 (12:11 -0700)
* commit 'b54c514c7e429d3a50bed7c68370babbf1b2b47c':
  hwc: protect on-screen gscaler buffers


Trivial merge