tree d7b8ef5ac62da92ab15330df3ec5d28475ac756c
parent 7bd6d79e1ff539899b608398fdd62081e6f20790
parent f6b4389da90d549796e1b9fd95a40d24b1f6af56
author Xin Li <delphij@google.com> 1602562957 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602562957 +0000

[automerger skipped] Merge ab/6749736 in stage. am: 2ef7e39983 -s ours am: f6b4389da9 -s ours

am skip reason: Change-Id Id9c756552c08d7690b99987dafadc13448a0c236 with SHA-1 0581f5b05b is in history

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

Change-Id: Iacae332383fb32b8b3460642c6408671c090372b