am 84271554: am ef5f57a2: Merge "hwc: always make forward progress in fimd set()...
authorGreg Hackmann <ghackmann@google.com>
Tue, 9 Oct 2012 16:01:04 +0000 (09:01 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Oct 2012 16:01:04 +0000 (09:01 -0700)
commitf37ab89a5168b7bcdb9eb85cbcb4db2f01fda986
treea4497254df8d16b4133a8a19b452c859f99c109f
parent52745d5318c880948a1a527c1eb4c7139af848e3
parent8427155476615bd3a5a21d34c6d0e97228062fa6
am 84271554: am ef5f57a2: Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev

* commit '8427155476615bd3a5a21d34c6d0e97228062fa6':
  hwc: always make forward progress in fimd set()