tree ae412434bc0c4f2d2ec123b03b8963e80bc78879
parent caa60f0b288afb59e0834933b2cdc6c0470d9bac
parent 95a675ce91b03955f61afa015663e8600e6ed4e6
author Kevin Chyn <kchyn@google.com> 1566252525 -0700
committer android-build-merger <android-build-merger@google.com> 1566252525 -0700

Merge "Remove unused setting" into qt-r1-dev
am: 95a675ce91

Change-Id: Ia72e5c6625f8213c807966312550111bcbdcb767