tree aad831b2f18e11b5f05aae112a2c942ad9baedab
parent 148db9dfa669e6a0a571f58195911a4da43c658b
parent 2ecf97efe5525d6ef5b2ad63c20535e8e3af06c3
author TreeHugger Robot <treehugger-gerrit@google.com> 1501261803 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1501261803 +0000

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