tree 385078954a47afbb140c0ecdb5d17e087a1f95df
parent 84206dab52b1244c8e1aac6905b0b5b33e89b5e0
parent 0b037789662d1c16627dc5b509d1ac55bc76971b
author Sunny Goyal <sunnygoyal@google.com> 1428719086 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1428719086 +0000

Merge "Deduping shortcuts to app-shortcuts if they have a valid intent" into ub-launcher3-burnaby