am ef5f57a2: Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev
authorGreg Hackmann <ghackmann@google.com>
Tue, 9 Oct 2012 15:59:40 +0000 (08:59 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Oct 2012 15:59:40 +0000 (08:59 -0700)
commit8427155476615bd3a5a21d34c6d0e97228062fa6
tree855c2e943125463045179aaa62fbcbf8526894b7
parent6ef93cabf7bf9adcc9274555cf7f4323202b4308
parentef5f57a25d92c7e159e024d0ad9b0c118c467da2
am ef5f57a2: Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev

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