tree 6107f31db998c4740dc59e16f5e049b8de9a17ec
parent 54ae7ec1fdfc3f1b73dee8d3f2f65962c46072d6
parent 663bb990f004137ae0c5a62cf378bed8d19f7db4
author Tony Wickham <twickham@google.com> 1497906433 +0000
committer android-build-merger <android-build-merger@google.com> 1497906433 +0000

Merge "Disable haptic feedback on items in Folders." into ub-launcher3-dorval-polish
am: 663bb990f0

Change-Id: I619db88f33453a3008e794d838effe3d29de7cb4