tree eb6fc0907b83af0e6eef51e1528812ad033b817b
parent daf30c1505cb9a9c07bc3d0562d31f258752efa0
parent 41253866876bc3cbb7d52cd0f28063cea7aca59d
author Tony Wickham <twickham@google.com> 1474405518 +0000
committer android-build-merger <android-build-merger@google.com> 1474405518 +0000

Merge "When shortcuts close, only set text visible if not in hotseat." into ub-launcher3-calgary-polish
am: 4125386687

Change-Id: I10a7cdd6b8eb49633afa4e07e0e1a184760786e5