tree 0114c5d3c2886d95a50b159cf772291bac4db29b
parent b4323adc6a040f3aca6149b636dbf75d364f897b
parent 8b213f1ad950c0d115a8d5a3016a267432b3c980
author David 'Digit' Turner <digit@google.com> 1252605293 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252605293 -0700

am 8b213f1a: Merge change 24474 into eclair

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

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