OSDN Git Service

Merge "New haptic feedback constants" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 24 Aug 2017 21:02:57 +0000 (21:02 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 24 Aug 2017 21:02:57 +0000 (21:02 +0000)

Trivial merge