Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_native / 958a290a7ca2ebe755b7c2dd623c2568ffe16ec8
commit958a290a7ca2ebe755b7c2dd623c2568ffe16ec8[log] [tgz]
authorAndreas Huber <andih@google.com>Mon Apr 12 17:18:43 2010 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Apr 12 17:18:43 2010 -0700
tree3e5f86120f1ff365c1753580da989ae35d07c503
parent39cdc3ceb767f14222f7447ccb4fa1d1e201fd30 [diff]
parent692dc8a970b48057ac268667bfcc69e584d61542 [diff]
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 '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194' into froyo-plus-aosp

* commit '5baa5e1917ba4a212fa280b8b6cc3bbbf9382194':
  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: 3e5f86120f1ff365c1753580da989ae35d07c503
  1. awt/
  2. camera/
  3. cmds/
  4. common/
  5. include/
  6. libs/
  7. opengl/
  8. vpn/
  9. MODULE_LICENSE_APACHE2
  10. NOTICE