tree 1f6dcaaa60c3f55fb4e37a54049f855265aa5101
parent 5f25789be20344f4324302dabc1151287cc06449
parent e51220cd3a607773dc945c74fc13ea1f94bfe8a3
author Jon Miranda <jonmiranda@google.com> 1564023021 -0700
committer android-build-merger <android-build-merger@google.com> 1564023021 -0700

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

Change-Id: I4eddd506b463a11aaafb8147158b3842952aaff3