tree 8b632efc290e75ce6af4bb625de00baace1ba4a0
parent 56ce933cf125e5c2d365dbfddd5f3f7fb3d4f327
parent 20c915d80356859d8716f014a7d4950f06c38cfc
author Dianne Hackborn <hackbod@google.com> 1293046499 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1293046499 -0800

am 20c915d8: am 5261cea2: Merge "Fix issue #3224616: TimeUtils.formatDuration() can drop 0s." into gingerbread

* commit '20c915d80356859d8716f014a7d4950f06c38cfc':
  Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.