tree 4c356bd35a137e560b1a563a9ceff6366d90ca9d
parent 82a1372070e75df1a0201b22e33514bbb0d7b5e5
parent 57fa3e8b4c94125ddb5be015dd7fbde4a458894f
author Jeff Brown <jeffbrown@google.com> 1285978114 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285978114 -0700

am 57fa3e8b: am 9e32a438: Merge "Support haptic feedback for virtual keys defined in key layout." into gingerbread

Merge commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f'

* commit '57fa3e8b4c94125ddb5be015dd7fbde4a458894f':
  Support haptic feedback for virtual keys defined in key layout.