am 41b29cb0: am 3aad8c38: Merge "Fix an issue where the track duration does...
am 41b29cb0: am 3aad8c38: Merge "Fix an issue where the track duration does not include the last sample duration" into gingerbread
Merge commit '41b29cb0'
* commit '41b29cb0':
Fix an issue where the track duration does not include the last sample duration