tree 4bd62b87eadddf1cf52907826ee918ea6df2588e
parent f617d254cac0cd46a491af92ef8094759baf8791
parent 05bfabfc02c4cae4fd3d73d1a7631bb2f3bebec0
author Xin Li <delphij@google.com> 1598992608 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992608 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 05bfabfc02 -s ours

am skip reason: Change-Id I88f54d5cf388aeacbf1da48e3e5f1e89f37ba836 with SHA-1 e8e680005d is in history

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

Change-Id: Iacf35e3c0c411447b67d32c76d9cc6a709099073