OSDN Git Service

am 7d973514: Merge change 27449 into eclair
authorMarco Nelissen <marcone@google.com>
Mon, 28 Sep 2009 16:27:10 +0000 (09:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Sep 2009 16:27:10 +0000 (09:27 -0700)
commit14e8e988cfdd01b665f5b49fb6f95a6c11ce3660
tree87ac49fa0c51663e125d7d7ecf54007b35054997
parent89172dbc0dcc62a5921a2e619612c78b48de9514
parent7d9735142f75c3bf30b420fdd006dc356f32fede
am 7d973514: Merge change 27449 into eclair

Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp

* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
  Always consider m4a files as audio, even when they contain a video track.