tree a2141633f8691643bf4c263103b7e6154b0e1345
parent 385d62e6441b41d4b77ec5a059acf7aca5257a00
parent d9760ee2de0a245fe0a0c11891723ef3f1513de9
author Sunny Goyal <sunnygoyal@google.com> 1428719483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428719483 +0000

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

* commit 'd9760ee2de0a245fe0a0c11891723ef3f1513de9':
  Deduping shortcuts to app-shortcuts if they have a valid intent