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

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