Merge "Only change the resize policy to fixed if we haven't set the resize policy...
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 24 Jan 2020 11:27:15 +0000 (11:27 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 24 Jan 2020 11:27:15 +0000 (11:27 +0000)

Trivial merge