tree b765255544d77a68ecfcb15471a670824e3f8148
parent d82d667194873d772429cc4d11e8ac3fb6ce319e
parent f7b75392fc3c7d952e800dee3e81246be9df8ff1
author Pinyao Ting <pinyaoting@google.com> 1573784186 -0800
committer android-build-merger <android-build-merger@google.com> 1573784186 -0800

[automerger skipped] Merge "fix custom shortcut test" into ub-launcher3-qt-future-dev
am: f7b75392fc -s ours
am skip reason: change_id I296452faea67568b39a35968bb813dc4e51a51fc with SHA1 44677f7e88 is in history

Change-Id: I880b94cbc3f5dfcd98f8886c454657bba466885e