tree 8d6b6191e5b4b63041450d83d599cea8d954459c
parent f3a4562e4a4af9f2cec3e98a8a01f5d50acba235
parent a0654a3523cecfaa0800086753b8738ce3bc1d35
author Winson Chung <winsonc@google.com> 1320704266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320704266 +0000

am a0654a35: Merge "Altering touch feedback for qsb assets. (Bug: 5560273)" into ics-mr1

* commit 'a0654a3523cecfaa0800086753b8738ce3bc1d35':
  Altering touch feedback for qsb assets. (Bug: 5560273)