tree d727754541de73d1d2e77b1b407ea44434080728
parent b6d56531c2a41b3e61ef913e94c76752d8869a52
parent 83a9c614c1353648a4d68081ededbc1165d9bce3
author Xin Li <delphij@google.com> 1598998178 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998178 +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 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: Icafde272317fa46283ccaa8a5ad54a1c6fb0ab29