am 0f3b8e89: Merge change Ieef539c3 into eclair
am 0f3b8e89: Merge change Ieef539c3 into eclair

Merge commit '0f3b8e8966d3da99e7844d6ca8083cccf23bef01' into eclair-mr2

* commit '0f3b8e8966d3da99e7844d6ca8083cccf23bef01':
  Fix a potential IllegalArgumentException caught by monkeys. #2176776

klausw/hackerskeyboard,klausw/hackerskeyboard,klausw/hackerskeyboard,klausw/hackerskeyboard