tree 8d6b6191e5b4b63041450d83d599cea8d954459c
parent da06e315230c71ac457e74cb883aa77fa1d887f3
parent 6b3909fd72efc7c5ca98d2e1c989025984ad0c38
author Winson Chung <winsonc@google.com> 1320712754 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320712754 +0000

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

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