tree 498f372e4181d9c7c930e30fd77e905100f517be
parent 5500ee9cb429d6e18f478c27b652d40bbd2888fc
parent 1bad3382fc662a40612f0483c1bc9d992099a3a0
author TreeHugger Robot <treehugger-gerrit@google.com> 1637616952 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637616952 +0000

Merge "Add timeout to AbstractLauncherUiTest.getOnUiThread" into sc-v2-dev am: 953641e28d am: 1bad3382fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16321879

Change-Id: Iee12654f4221a0afef718057d9569d4ac2527538