tree 613cdb9c70d07c90bb4585fc83c9ddc0153e882b
parent 0cd5bd5f950a044827fce628c5bff163005a3b55
parent 9447e887db176a2db655628a1e2bd271e0778729
author Pinyao Ting <pinyaoting@google.com> 1564680693 -0700
committer android-build-merger <android-build-merger@google.com> 1564680693 -0700

[automerger skipped] Merge "Ensure each dot contains only relevant notification to the shortcut and displays system shortcut when long click on deep shortcut." into ub-launcher3-qt-qpr1-dev
am: 9447e887db -s ours
am skip reason: change_id Idc9eaed55e900ed4027a43ee9c3fd7dc6f4480b2 with SHA1 0cd5bd5f95 is in history

Change-Id: I6320f2cdf7260e49c64ca5295d4db2c0ab611702