am 60b9fbf3: Merge "hwc: Add support for video overlay" into jb-mr1-dev
authorBenoit Goby <benoit@android.com>
Wed, 3 Oct 2012 20:53:55 +0000 (13:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 20:53:55 +0000 (13:53 -0700)
* commit '60b9fbf32e6a87190b2d6d64f65eb29a8e6775c1':
  hwc: Add support for video overlay


Trivial merge