tree f7a8da0070df451118f42917626ecd8da2f4bd74
parent 330dbb4f28aa0895ccddd56827bd003097d20f71
parent 55f5bd730cace56d224de33461f575f41bdd480f
author Sunny Goyal <sunnygoyal@google.com> 1469734328 +0000
committer android-build-merger <android-build-merger@google.com> 1469734328 +0000

Merge \"Showing the shortcuts in the disabled state and removing ti from the menu when its disabled\" into ub-launcher3-calgary
am: 55f5bd730c

Change-Id: I94d2deab5f6d0ba40965185d4132cb41ab340069