Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_native / ae630622bf5632124494bdf977288597921bf974
commitae630622bf5632124494bdf977288597921bf974[log] [tgz]
authorAndreas Huber <andih@google.com>Mon Apr 12 17:21:33 2010 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Apr 12 17:21:33 2010 -0700
treec4333b1d19b4dea3beb4fd5c98a3afcd88572544
parentb3815412f0b46718330febf8c54a8b67c53b7f51 [diff]
parent958a290a7ca2ebe755b7c2dd623c2568ffe16ec8 [diff]
am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo

Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken

* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
  Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
tree: c4333b1d19b4dea3beb4fd5c98a3afcd88572544
  1. awt/
  2. camera/
  3. cmds/
  4. common/
  5. include/
  6. libs/
  7. opengl/
  8. vpn/
  9. MODULE_LICENSE_APACHE2
  10. NOTICE