tree 6f18e1fcb2b1033d9fbebb693943dfb82d1a7b96
parent 9938524855c7490efadf0d98c0d9ff516745d329
parent f9cf13f77a86b44e41377f8307d50565a00bb73a
author Vinit Nayak <peanutbutter@google.com> 1637710565 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637710565 +0000

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

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

Change-Id: I122c70bde49e58f3f66cddee9e1fabe562357153