am b01cd33b: Merge "hwc: support blending" into jb-mr1-dev
authorGreg Hackmann <ghackmann@google.com>
Thu, 16 Aug 2012 23:03:35 +0000 (16:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Aug 2012 23:03:35 +0000 (16:03 -0700)
* commit 'b01cd33b8e98017e3d1f092e7cf0e8cae5cb6b93':
  hwc: support blending


Trivial merge