tree 4683ab9e18066cefcbc847da1ab61003b7e63dc0
parent a0a864e571250097476181cb6d9c7b0f1268b197
parent c197176cd2dfa3da0760f1d2dc73b5b86dda2e2d
author Winson Chung <winsonc@google.com> 1527823406 -0700
committer android-build-merger <android-build-merger@google.com> 1527823406 -0700

Merge "Fix regression in virtual key haptics" into pi-dev
am: c197176cd2

Change-Id: Ifef4e6978d0731b6270eb0fc0b1fe23fe27d1d3b