tree 5b2d0facb9e1c3e3ded2d5d0ae709f92b9491af6
parent 3c2970e4076bf47407184529f90b20abbed5f7d0
parent fcfac8156d839937ff5aea55b8188b8d37d41787
author Miranda Kephart <mkephart@google.com> 1558052600 -0700
committer android-build-merger <android-build-merger@google.com> 1558052600 -0700

Merge "Avoid double triggering assistant gesture haptic" into ub-launcher3-qt-dev
am: fcfac8156d

Change-Id: Ic3b5b77441e04ff45f6f97f9f3824d8577ed7665