tree 1edcb1aa76b53dd329d59e583b8ff43db7165a41
parent 261d67e3ee14c9bb7ed3c051a1e1d1b30606d3d7
parent f015c6d04c5de15927f24edc9ac689adbe70f2e4
author Ilya Matyukhin <ilyamaty@google.com> 1525203099 -0700
committer android-build-merger <android-build-merger@google.com> 1525203099 -0700

Merge "Updated haptic effect for success" into pi-dev am: d6dbebf7ba
am: f015c6d04c

Change-Id: I9a33d58b2b9d9af17e9aa3082cf7ab63b7e5d0d5