tree 42d9133b3d08b2341d9e7ee86e4ddd2e5f6e56a0
parent 1f5f124d85ee54980257395e43e09ce30dcb5d63
parent 7ff19aa56002d52f6cd3413dde5a0ec1ca8c47d5
author Vadim Tryshev <vadimt@google.com> 1556911579 -0700
committer android-build-merger <android-build-merger@google.com> 1556911579 -0700

Merge "Temporary hacks to make tests pass on Taimen" into ub-launcher3-qt-dev
am: 7ff19aa560

Change-Id: Iffd29c6af69172f03143c1e67fa67d685bd0ec8d