am 74f79c1b: Merge change 25440 into eclair

Merge commit '74f79c1b2215525f8171551812b014bdb7cfba04' into eclair-plus-aosp

* commit '74f79c1b2215525f8171551812b014bdb7cfba04':
  Fix a minor bug in is_alnum_string()...