tree a56b7906192799f2198fa83322fc904fff85ff9b
parent fa283822d65d128a04ad6be228862de7c16b39f9
parent 7308cde2cac46dec0dfd09144feb4475ad6d4893
author Tony Wickham <twickham@google.com> 1498685144 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498685144 +0000

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