tree 85ead3ce232755d18dc87fb080de6b6fd87df5d6
parent 1c93163efaa868dd60e7d43adb3ab8d8fce2745e
parent 22617e92ca5e0179366dc4c32e6e542e9e71b422
author Samuel Fufa <sfufa@google.com> 1623719895 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623719895 +0000

Merge "[Build Blocking] Fix conflicting resource IDs for work tab" into sc-dev am: b8cec440cc am: 22617e92ca

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

Change-Id: I1af76358f690e853172a687cb24afdf90adbd695