am 7bbb1999: am 72521860: Merge change I8f657a99 into eclair

Merge commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa'

* commit '7bbb199912bd4bc7b4827358bcdd90acc826e7fa':
  Avoid a crash trying to get a substring whose start is after its end.