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)
commit52745d5318c880948a1a527c1eb4c7139af848e3
tree63a79ecf4cc784379752d746e08530f1035e6a11
parent736cc3c9413da9ba7fd439ac8235ac51b4bcd49e
parent6ef93cabf7bf9adcc9274555cf7f4323202b4308
am 6ef93cab: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6ef93cabf7bf9adcc9274555cf7f4323202b4308':
  libgscaler: Fix acquireFenceFd leak with m2m gscalers