tree b98c12d9441ce784dbd0d357bac9dd47c0a95efd
parent 59aea2c4ed1367e650dd3c12ada42c84580778c0
parent 5767441c19bd4b222a9ea112ddba93e0c2a8a86d
author Xin Li <delphij@google.com> 1602564629 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602564629 +0000

[automerger skipped] Merge ab/6749736 in stage. am: 2ef7e39983 -s ours am: f6b4389da9 -s ours am: 5767441c19 -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: I0ea6e626d9c3ac31e9ff6a93ce05929dca203571