am bd1eb5d0: am e07d6a77: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit 'bd1eb5d05077ea06c1cfed99daa5669cdf6f41d2'

* commit 'bd1eb5d05077ea06c1cfed99daa5669cdf6f41d2':
  Fix a bug in backspace handling for the "Tap again to save"
  Fix bug: 2693836 - Russian keyboard is missing a letter
main
Jean-Baptiste Queru 2010-08-24 11:55:11 -07:00 committed by Android Git Automerger
commit a748861943

Diff Content Not Available