am a4160068: am 294cd985: Merge change 24850 into eclair

Merge commit 'a4160068beadf64db99f42ca327bfe263cc46a85'

* commit 'a4160068beadf64db99f42ca327bfe263cc46a85':
  Last big work on #1991910: Make swipes work with capacitive keys