tree 90e4f5f7f0a2137ed7716a41b133c4f8b8521a00
parent 9143dbe2b247a335104413987971d6689b605fdc
parent 3629b93546623897d3d490825cdc87d3b5d75300
author Tony Wickham <twickham@google.com> 1616526581 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616526581 +0000

Merge "Add TaskbarView as a child of Hotseat" into sc-dev am: 3629b93546

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

Change-Id: I29fc8e00b22884ee7a89d32440bc956a6620e5d7