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)
commitef5f57a25d92c7e159e024d0ad9b0c118c467da2
tree855c2e943125463045179aaa62fbcbf8526894b7
parentde5fb8eea5a909f0b85d179d0e7336770c9c6c53
parentec13dead1baa6ffb18efd08f33aef9be52707b49
Merge "hwc: always make forward progress in fimd set()" into jb-mr1-dev