tree 2da1b5a36175216e6a66385228745165a3c94387
parent 31747c8c1fec7aeedde7d8504b002e59d9d3a35e
parent 762d1fc64f5a0a3a931fdd1bf7c5b6f663b076fd
author Sunny Goyal <sunnygoyal@google.com> 1555445239 -0700
committer android-build-merger <android-build-merger@google.com> 1555445239 -0700

Merge "ShortcutInfo renamed to WorkspaceItemInfo" into ub-launcher3-qt-dev
am: 762d1fc64f

Change-Id: I3e6333f7df25f9244a03dc011ea205e393f7c92b