am 8b213f1a: Merge change 24474 into eclair

Merge commit '8b213f1ad950c0d115a8d5a3016a267432b3c980' into eclair-plus-aosp

* commit '8b213f1ad950c0d115a8d5a3016a267432b3c980':
  Fix an infinite loop in time2sub.