Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev
authorGreg Hackmann <ghackmann@google.com>
Tue, 9 Oct 2012 15:55:57 +0000 (08:55 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 9 Oct 2012 15:55:58 +0000 (08:55 -0700)

Trivial merge