tree 4cd438b7a12c6cc5f5df0dd9c216b2ba0ea0340b
parent 20f16a2bfef0f76afbbf5a255c1fc681eaf4b7c7
parent dcb4eddebe43374f6c4c968cf8114ad1551b127b
author Michael Jurka <mikejurka@google.com> 1326978753 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1326978753 -0800

am dcb4edde: Merge "Simplify code for All Apps touch feedback"

* commit 'dcb4eddebe43374f6c4c968cf8114ad1551b127b':
  Simplify code for All Apps touch feedback