tree 3702d50188bee2ff7fbef0aee27ae4af133dac8b
parent 85561d1e44a00ba4781c4c9b56fd5ccf29d1ea1c
parent ec72bf63dfde4736389ffc7ae5a0ab4d3be0653a
author Tony Wickham <twickham@google.com> 1571879389 -0700
committer android-build-merger <android-build-merger@google.com> 1571879389 -0700

[automerger skipped] Merge "Fix testQuickSwitchFromApp" into ub-launcher3-qt-future-dev
am: ec72bf63df -s ours
am skip reason: change_id Ie137261ce65bfd3dd39df78d57784854a026e967 with SHA1 bc42d64c85 is in history

Change-Id: I7e3f5f26ed22351f0b331edcc79a88190416d6b1