tree 1f6dcaaa60c3f55fb4e37a54049f855265aa5101
parent 4f68901b5baa0ca051c4bcee85fe18b9908331cd
parent 95bc50fafa1b89e7ba5b5ed5d7e2184d8cc7b7c0
author Jon Miranda <jonmiranda@google.com> 1564020978 -0700
committer android-build-merger <android-build-merger@google.com> 1564020978 -0700

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

Change-Id: Ia00ea7d1298a6f46c1ff779f13a3bf015ec5cd8a