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.