tree d27200db013de944ffb8f19fa8e5218971590b7b
parent 6c53e555e9358ea41aec28d8098623a35f24e32f
parent 620542254c9b63cd17d2deefb07ffd39d8a54623
author Winson Chung <winsonc@google.com> 1320704095 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1320704095 -0800

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