tree c0da37f5f20978bf392cafa0ddf1f9322d87c9c5
parent e5e34a7c910b5351c612bca7cf547eff8dd3317e
parent 95bc50fafa1b89e7ba5b5ed5d7e2184d8cc7b7c0
author Jon Miranda <jonmiranda@google.com> 1564020998 -0700
committer android-build-merger <android-build-merger@google.com> 1564020998 -0700

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

Change-Id: Id0d54ce7b849737af948c29297fbdda0a31ed30d