tree dc53d8692f13a862f83f9718f0d6ae4da4a60ee8
parent aae3bcb20a08209b98fc88518485386d27115420
parent 91fc8d8c9effa704d5e0a70da4857299366a70d4
author Steve Elliott <steell@google.com> 1557451447 -0700
committer android-build-merger <android-build-merger@google.com> 1557451447 -0700

Merge "Global Actions Panel plugin can override Global Actions background" into qt-dev am: 1fe353f6fd
am: 91fc8d8c9e

Change-Id: Ib6761a3c6bab4e829db6e60b4d14b1b8715b1bc5