tree b3aec5f6349b66037fe02b7d7a75f1bbac58e75a
parent a6901eb32a8491c0eb495716a5f945218dc730a9
parent 3e4a8f513131a3c09f8d50f35f93ef3274844b6f
author TreeHugger Robot <treehugger-gerrit@google.com> 1600969496 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600969496 +0000

[automerger skipped] Merge "Remove CurveProperties#pageParentScale" into ub-launcher3-rvc-qpr-dev am: 3e4a8f5131 -s ours

am skip reason: Change-Id Ib3cfba6ebafbcb90de9c6b1ab79f53605d995321 with SHA-1 69f9cae810 is in history

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

Change-Id: I3860206e6f63bfce346e0fe70865a7149528942e