tree fe7b5f618fec07b82c643eed138e46a5adde767a
parent 1802dc34663e19412f66722833512b4d4cd44479
parent e69488009e7923415cd9d6a6e29531bb46529b89
author Xin Li <delphij@google.com> 1598996782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996782 +0000

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