tree b64540298d9b1d27ca0560dbe0d58d6cb87afd47
parent 3087951777fdf29ed6cd70cd154266fd5cac8b42
parent d9f8a6bd9defb187566434a87da0895e979f1bd2
author David Lin <dtwlin@google.com> 1499988434 +0000
committer android-build-merger <android-build-merger@google.com> 1499988434 +0000

Merge "Fix issue with double vibration trigger" into oc-dr1-dev am: f34b4633bd
am: d9f8a6bd9d

Change-Id: I496e6162949d0e12093e09f690d19a10e7132351