tree 77d2745acb0680c4f90fd9a4a89485f99006559a
parent 99d814e54b28efc8c8d8d6dec4bb036a380c3c3f
parent 1cd01b023acc123b771765b7297d8aaedac224e0
author Sunny Goyal <sunnygoyal@google.com> 1481847689 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481847689 +0000

Merge "Ensuring that ShortcutInfo always has an icon" into ub-launcher3-master