tree 3dca82a1532c9a8b16566bf8987f3a7e18260d0c
parent 5fe5844cb861e1ab2a4aa6df952892a969b4ee9c
parent 174d068a11709b98660c23b563e345f87b890c6c
author TreeHugger Robot <treehugger-gerrit@google.com> 1631308997 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631308997 +0000

Merge "Allow restore between TYPE_PHONE AND TYPE_MULTI_DISPLAY in RestoreDbTask" into sc-v2-dev am: f8d4041c84 am: 174d068a11

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

Change-Id: I67c9f4f4754cd2414ebd91e6fc6c1b9759984c4c