tree b51201589f34cc858f337e967de1b5a3c75ad79c
parent 30bcf18025db4613a84d96e694e84787e8b63fca
parent 430465a3d5ff0dcdd0c2e263d862049d93075a07
author Kholoud Mohamed <kholoudm@google.com> 1621524634 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1621524634 +0000

Merge changes I46501369,Icd1ddd43 into sc-dev

* changes:
  Revert "Moving taskbar lifecycle to TouchInteractionService"
  Revert "Renaming TaskbarController to LauncherTaskbarUIController"