tree d27200db013de944ffb8f19fa8e5218971590b7b
parent e218dd37ac67d38ec53b225343ac36b1c3323a97
parent a0654a3523cecfaa0800086753b8738ce3bc1d35
author Winson Chung <winsonc@google.com> 1320704177 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320704177 +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)