tree f197d2388dfadf4111819d4b176ba9030998e623
parent cfb630f8de1df7465c83487fa1437f70930414f6
parent b4175d89ed8a419ca276bb7884385685550b0dd1
author Tony Wickham <twickham@google.com> 1516830749 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516830749 +0000

Merge "Simplifying/fixing logic for ignoring touches in quick scrub" into ub-launcher3-master