tree 160299959252fcb01f06b381264d134119d6840f
parent c96d6c75504b6d85fec60a9b26e3b2220e090b3b
parent 707b1d8e6602baae8244f42ab5ac8ec322d0791f
author TreeHugger Robot <treehugger-gerrit@google.com> 1628107960 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628107960 +0000

Merge "Storing form factor as part of backup and disabling restore if form-factor is different" into sc-v2-dev am: b78e77f581 am: 707b1d8e66

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

Change-Id: I9f2a9c6e72a0243a030259efff372ca93d6beecc