am fdf73d2f: Merge changes I28fc9f33,I7594e39e,I831e4839 into jb-mr1-dev
authorGreg Hackmann <ghackmann@google.com>
Thu, 4 Oct 2012 18:18:44 +0000 (11:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Oct 2012 18:18:44 +0000 (11:18 -0700)
* commit 'fdf73d2f9ff2aad79d827b95f99f57538d7fde3d':
  hwc: keep gscaler streaming on between frames
  libgscaler: don't reconfigure m2m gscaler every frame
  libgscaler: split stop operation into discrete wait and stop operations


Trivial merge