Merge "hwc: protect on-screen gscaler buffers" into jb-mr1-dev
authorGreg Hackmann <ghackmann@google.com>
Mon, 15 Oct 2012 19:07:53 +0000 (12:07 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 Oct 2012 19:07:53 +0000 (12:07 -0700)

Trivial merge