tree 0b6876660a439543ee82bcc397f08ec59c62c040
parent 8676841fda9c0eb0c6ff21283901f7c2154aa447
parent f8f430d37f51302daee2473c16221a20b58b233c
author Tony Wickham <twickham@google.com> 1528818930 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1528818930 +0000

Merge changes from topic "am-aa97c11a-ca5a-48a7-993d-107856bfc8c7" into ub-launcher3-master

* changes:
  [automerger] Fix some issues with haptic am: 29aef52be3
  Fix some issues with haptic