tree 1f6dcaaa60c3f55fb4e37a54049f855265aa5101
parent 0353d124db4898c9e7a08c846f13131e648c3935
parent b4a28867d3f9385164ee4c9221c7c12327b912d9
author Jon Miranda <jonmiranda@google.com> 1564024979 -0700
committer android-build-merger <android-build-merger@google.com> 1564024979 -0700

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

Change-Id: Ia090e4660c4e36de24f1fb3653743b1ad31fe093