am 876a5dfe: am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo

Merge commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976' into kraken

* commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976':
  Ensure the selection does not change in setTextAndKeepSelection.