tree 80fcf5e222c5a1338871b0e4f8ab22efed745e4c
parent 86aaa3b9705b1c0f1e150ae7980047911df79e70
parent 3b978f98df2e2a3d7e24999c3ab35dabe883e45c
author Samuel Fufa <sfufa@google.com> 1623777689 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623777689 +0000

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

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

Change-Id: I282f17cc3a4d275877ea836243fb57e748d02f8c