tree 34046ddff553cc0e354721ace801a1cee83dda86
parent eeb084cb4b5fe19841289e8b3adf56e0a13ce614
parent 8e26fe9ae9a206bfed1cad05049b93c65530ae69
author Tony Wickham <twickham@google.com> 1523472061 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1523472061 +0000

Merge "Add haptic when entering quick scrub" into ub-launcher3-master