tree 99a8af500414665f915adac2b60663354dfc4fa7
parent 9a2d268675472c9ea94449491221dcb115eab63b
parent 3676989b75a17f1bd99359a145759b528aa94726
author Tony Wickham <twickham@google.com> 1600980081 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600980081 +0000

[automerger skipped] [DO NOT MERGE] Remove CurveProperties#pageParentScale am: a5dae88b71 am: 3676989b75 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I78628b9933c1f34def6b60cf0fc661f32d7c85c1