tree d59cbcadc7ed0ba2c3f789df8276df93b94fa73a
parent be8227dbe2e71fae4f1dce453bf6cb0fc4f79912
parent f730a2c59261999547ab1d1bb8765f58209e8103
author Vinit Nayak <peanutbutter@google.com> 1637709588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637709588 +0000

Merge "Revert "Extract assistant logic from NavigationBar to share with Taskbar"" into sc-v2-dev am: f730a2c592

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16331846

Change-Id: Ic36246b358d5aeef09e26d054abacbb6f10d3a83