tree 06cb0a8d24c999343a2d0318923c6617d765e82c
parent a4c7c13e2af692794709a9896018c0b403041328
parent 66d17ca32db7114e7bff1811d3e5c6669eb49c71
author Sunny Goyal <sunnygoyal@google.com> 1469855598 +0000
committer android-build-merger <android-build-merger@google.com> 1469855598 +0000

Merge \"Badging shortcuts with app icons\" into ub-launcher3-calgary
am: 66d17ca32d

Change-Id: I726a35f9267c2e1561a6da91eff77a32a07b772b