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

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

Change-Id: Ifd8aa55513dea180f9b0438ed2126403b3d00c18