tree e365c049baeaea3ef7d37b3b215ffc7295bb78e0
parent 83f7683509b95614a1a74f8bddb0c5691f9968db
parent 3705664cf0b5e3b101d2a11377c13fab5675c8e2
author Hyunyoung Song <hyunyoungs@google.com> 1505411508 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505411508 +0000

Merge changes from topic "am-ef87c1d2-519f-467f-b097-802ff59b63b3" into ub-launcher3-master

* changes:
  [automerger] Remove haptic on touch down Bug: 65463659 am: d315ff2bc2
  Remove haptic on touch down Bug: 65463659