tree 1f6dcaaa60c3f55fb4e37a54049f855265aa5101
parent 3728c7cba762e4225086c2f63daddd71313a036b
parent 3505290a16520079510bb35d567f938bb87731cd
author Jon Miranda <jonmiranda@google.com> 1564025036 -0700
committer android-build-merger <android-build-merger@google.com> 1564025036 -0700

Merge "Fix bug where rounded corners were being set despite being disabled." into qt-dev am: 95bc50fafa am: b6ce5eb1de am: 0aeff344ee
am: 3505290a16

Change-Id: I95d0ff8a4902efcce579ccc20dbfd2a2aa6721ef