tree bb44dbd8614569a078fb89f11ee1be7edadab6a1
parent 8580dd584a59b8895db0f4603321346ffe3ecd26
parent a3c9fb125c7449df5add990e91e0e3471e3cc776
author Winson Chung <winsonc@google.com> 1442602428 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442602428 +0000

am a3c9fb12: Merge "Requiring key chord to delete icons and folders on the workspace" into ub-launcher3-burnaby-polish

* commit 'a3c9fb125c7449df5add990e91e0e3471e3cc776':
  Requiring key chord to delete icons and folders on the workspace