tree 39c6ff2c95d24e556cfdc6b2d721dfca98661a58
parent 0af263bc9bb1e24f6683b20e14c3965de9ba85a0
parent 4ecf494f4d1bb890066c63437f482cd892abf25d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594859756 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594859756 +0000

[automerger skipped] Merge "Merge "Calculate all apps cell height based on actual sizes." into rvc-dev am: 8127f13231 am: d5b15bb081" into rvc-d1-dev-plus-aosp am: befa44ac88 -s ours am: 4ecf494f4d -s ours

am skip reason: Change-Id I3d85adec3e7e3652fe4a258bd659382a3e696211 with SHA-1 f06e1b8b93 is in history

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

Change-Id: Ia6b4e6d4442b61f49266ea1330ff50b94acc5459