am a9f17c8b: am bf47092e: Merge "Fix track duration calculation if the start timestamp is non-zero" into gingerbread

Merge commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d'

* commit 'a9f17c8b424b505b50fdfb920cab37c32cbe628d':
  Fix track duration calculation if the start timestamp is non-zero
tree: 218d3f9b1e61594991f7d3b7f6385b9bb7751089
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/