tree c0282b2b1f656fb5b782c70ce67ebba7fc6eb8a0
parent 0c69c01e1ac9dc132ceef3602c725e9848003271
parent 36ace1c74e71248cecac050eac490ce750943026
author Tony Wickham <twickham@google.com> 1498685427 +0000
committer android-build-merger <android-build-merger@google.com> 1498685427 +0000

Merge "Don't fade in text if icon is in hotseat" into ub-launcher3-dorval-polish
am: 36ace1c74e

Change-Id: I79b0f2c780d7c02fcaffcf84af26f657f103c238