tree f692ffd189104cb99e878aca6cfd745170c9577e
parent 92623be9dfab7a46d8d6aacb33d4205e267edab7
parent 62d3363de25517437ff42cf918225cc984b2a927
author Xin Li <delphij@google.com> 1599011944 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599011944 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 05bfabfc02 -s ours am: e69488009e -s ours am: 83a9c614c1 -s ours am: 62d3363de2 -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: I83caf25e37a597ff175e6a9a942ad3902d0d6a1d