OSDN Git Service

am 0e29064d: Merge "Doc change: update media formats table." into gingerbread
authorDirk Dougherty <ddougherty@google.com>
Fri, 19 Nov 2010 18:53:20 +0000 (10:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Nov 2010 18:53:20 +0000 (10:53 -0800)
* commit '0e29064d1caad7b82aa76876e7e2f4c86ded06d2':
  Doc change: update media formats table.


Trivial merge