am ee960eb8: am 2badde50: Merge "libgscaler: Add support for sync fences" into jb...
authorBenoit Goby <benoit@android.com>
Mon, 8 Oct 2012 06:25:55 +0000 (23:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Oct 2012 06:25:55 +0000 (23:25 -0700)
* commit 'ee960eb8690965405d9c884aedabefa7d568961b':
  libgscaler: Add support for sync fences


Trivial merge