tree 26868867535208baee85196071b70885fe214ad3
parent 3fb05e460f5480d54e18201c675c4fc57c5ff927
parent 2d4fdc05e7f7b90418a83ea8c201c5f577c9d334
author Aran Ink <nesciosquid@google.com> 1557344974 -0700
committer android-build-merger <android-build-merger@google.com> 1557344974 -0700

Merge "Add secure settings for Global Actions Panel." into qt-dev am: c8cb13a537
am: 2d4fdc05e7

Change-Id: Icc2db70bca4dd0b1a9f1c8c9e7b9fde2263158bd