tree c98d619797ba51c0c9c9665e023b93f8e725ed78
parent a3734c86cc9965d33166f2709f30cc5993aac9d4
parent 6d09a7770fd1c8d1da3fe312864f083594ffd94d
author Pinyao Ting <pinyaoting@google.com> 1564516737 -0700
committer android-build-merger <android-build-merger@google.com> 1564516737 -0700

[automerger skipped] Merge "show dot on shortcut when incoming notification contains exactly the same shortcut id" into ub-launcher3-qt-qpr1-dev
am: 6d09a7770f -s ours
am skip reason: change_id Iddf4cfe8ad60c12e8de8b171bed392f1bb0a6761 with SHA1 559dd806d7 is in history

Change-Id: I8ae385066547894c13c3e2497c9bbe6cd53b7199