am fe1d52d5: resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp

Merge commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f'

* commit 'fe1d52d572a750d548d7f573b3e4cac8cc08712f':
  Memory leak in TextKeyListener.