tree 43bca05c29e0c5addcebfb4fc4dc8b65b34eee82
parent 5a48d3a28357a502e3da1bb88aeb0826362b3f5a
parent dc07ef153cfa9e206b4010b71c1affc27179a67e
author Brian Isganitis <brianji@google.com> 1622580161 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622580161 +0000

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

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

Change-Id: I43757dc5ee9a29d399f2841a3f09e082b54cf23e