tree 27c21b663c1cd24c0a1d52c527e00b77b5b68a6d
parent bd95c600f32fa54c514d9756c41e6a973bb0eb12
parent 643007d613a7346ebe8cc5f7d85e04a6eb612ac2
author Vadim Tryshev <vadimt@google.com> 1560380131 -0700
committer android-build-merger <android-build-merger@google.com> 1560380131 -0700

Merge "Not using settings app in tests" into ub-launcher3-qt-dev
am: 643007d613

Change-Id: I0b39d644c20d31e150f800ee1757d6ae3d6596ad