am 6ef93cab: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:31:44 +0000 (07:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Oct 2012 14:31:44 +0000 (07:31 -0700)
* commit '6ef93cabf7bf9adcc9274555cf7f4323202b4308':
  libgscaler: Fix acquireFenceFd leak with m2m gscalers


Trivial merge