tree ff7df4701dec8c10f440d366a7e406d0c480819a
parent 4241426635698440b3b45e0e56f1dc1775421f50
parent 29218b8fc733db5e046e8efbfacf1e0a4969ae48
author Winson Chung <winsonc@google.com> 1527842374 -0700
committer android-build-merger <android-build-merger@google.com> 1527842374 -0700

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

Change-Id: Ic763bc85534ec34082b50aeacef26786ce234161