tree 1f6dcaaa60c3f55fb4e37a54049f855265aa5101
parent b4a28867d3f9385164ee4c9221c7c12327b912d9
parent 0aeff344ee856964395f532c1e2d9396118fd60c
author Jon Miranda <jonmiranda@google.com> 1564023276 -0700
committer android-build-merger <android-build-merger@google.com> 1564023276 -0700

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

Change-Id: I3492687fc075e182ad4032452b779b677992c808