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

* commit '00f502a38cc4d6e2278f962b04308e6590dba36b':
  Doc change: update media formats table.