tree 7c90ac02164a01578f7355e1434886f27efdd2b1
parent 446daa2678ea1aa20b489b6d2654256c2ea28819
parent 89962500fb777b98f4fc4ba43dad9fe93eded53e
author Xin Li <delphij@google.com> 1606970375 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606970375 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ecb18a6573 -s ours am: 89962500fb -s ours

am skip reason: Change-Id I56abeae5adec79a1c7bdad1a261f0f62c055cf2e with SHA-1 b3ab1189d2 is in history

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

Change-Id: I53d2916c3602028ae40c6350424fab176db1e7f7