am b531855a: am a9911a58: am c0b4a4f1: hwc: do not allow gsc downscaling by exactly...
authorGreg Hackmann <ghackmann@google.com>
Fri, 6 Dec 2013 22:19:14 +0000 (22:19 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 22:19:14 +0000 (22:19 +0000)
* commit 'b531855a2966a5d7f0d23ca1259d1c1328ee3a44':


Trivial merge