tree 800cc515ebb9e7e295270e11f35eac60c7a1829b
parent 4988ae8cda8b7f9c7dd30a5cc723c047e7f9deec
parent 2a1be7a6165b49d21396bcb228a468bc79dd4d3e
author Sunny Goyal <sunnygoyal@google.com> 1436896588 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436896588 +0000

am 2a1be7a6: Merge "Fixing shortcuts not getting migrated to app icons" into ub-launcher3-burnaby

* commit '2a1be7a6165b49d21396bcb228a468bc79dd4d3e':
  Fixing shortcuts not getting migrated to app icons