tree 43bca05c29e0c5addcebfb4fc4dc8b65b34eee82
parent c2e037c3b704e3b7bd10dbc2f49995784e1080c7
parent 25bf26ff4de3bc2e48626b1aaba4b6ab432a06a8
author Brian Isganitis <brianji@google.com> 1622581025 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622581025 +0000

Merge "Create settings activity layout with explicit toolbar" into sc-dev am: d9463fbfdd am: 25bf26ff4d

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

Change-Id: I49371f11565a485d94fb2972ccc316cdf0ddb709