tree 2e7c7d0e087d4235f18aaeb8d1b0a1cc79e0da87
parent 3c5d03a044c1a6f057c6ad35dc8cf53fd017a962
parent 3b18d41e2cf714fed4b09ebf3b10f494edb264f2
author Tracy Zhou <tracyzhou@google.com> 1591854169 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591854169 +0000

Merge "Consider folder diff differently" into ub-launcher3-rvc-dev am: 3b18d41e2c

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

Change-Id: I8548df3271aa23c13e57fffede5ccd1d038a585b