tree 95d22d7c7d608857523763152ca62ed8c6077d62
parent 6b72e4b33db82cb073df0f2c1b7b7ef2a26b82d2
parent e46f9e5cf31b49f4a0b91b1b961659ed19065647
author Vadim Tryshev <vadimt@google.com> 1561757627 -0700
committer android-build-merger <android-build-merger@google.com> 1561757627 -0700

Merge "Temporary workarounds to make tests pass on a virtual device" into ub-launcher3-qt-r1-dev
am: e46f9e5cf3

Change-Id: Ib221d9c201f2b396b138631d8548d1862d2e7643