am 0e29064d: Merge "Doc change: update media formats table." into gingerbread

* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
  Doc change: update media formats table.