tree 2fda1810a2c2e1b8b8eaf3d1fb91aa66bcd0b281
parent 94b8ed8964fe429837134ce9a0f2f78d2a75dd44
parent ac73492ca56ae51cc4e1addc8a159fbc925d6094
author Jason Monk <jmonk@google.com> 1501273864 +0000
committer android-build-merger <android-build-merger@google.com> 1501273864 +0000

Merge "Nav haptics: increase threshold to 150 and don't do on long clicks" into oc-dr1-dev
am: ac73492ca5

Change-Id: I8ce276208b39618d7ff2c46a5cca5a2356633d6f