tree 1f6dcaaa60c3f55fb4e37a54049f855265aa5101
parent 2c5c9b0be017f005c23e72fa5b55bd8703526fb4
parent 723eff5532d6ae2cb5eb29a374a15b5013660006
author Jon Miranda <jonmiranda@google.com> 1564025104 -0700
committer android-build-merger <android-build-merger@google.com> 1564025104 -0700

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

Change-Id: I76a743256fdd42a122922ec2f38afea4ce8da74f