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)
* commit '8427155476615bd3a5a21d34c6d0e97228062fa6':
  hwc: always make forward progress in fimd set()


Trivial merge