tree 5ce8008408c2fd4b51185f0f666eb9de03e02a64
parent 7616f8deff6bdcc3ed45f8fcaf8e69c160d28a56
parent acd0c4204bf4fda0f3fc9c7735631d9133bec94d
author Sunny Goyal <sunnygoyal@google.com> 1473466426 +0000
committer android-build-merger <android-build-merger@google.com> 1473466426 +0000

Merge "Preventing a shortcut which requires permissions from being added to homescreen" into ub-launcher3-calgary-polish
am: acd0c4204b

Change-Id: Ide95340d3a4589a15bcb076e56f75da3a6e3c204