| commit | 1193ef6c325acde843b748df474794118ec67641 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Wed Jul 07 15:00:22 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 07 15:00:22 2010 -0700 |
| tree | b0194515fc22cab0e98151a6b87849c7afc33c27 | |
| parent | 6cfbb37957778c538dbfd1f324e348b8efd4d662 [diff] | |
| parent | 7b3f3048725dcb217599590fcb55a5b26b93dc4e [diff] |
am 7b3f3048: am 58c35573: Merge "Fix some bugs in the MediaProfileReader Because the video and audio encoders were stored in the same map, when we retrieve the name from the map, we can get a incorrect name." into gingerbread Merge commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e' * commit '7b3f3048725dcb217599590fcb55a5b26b93dc4e': Fix some bugs in the MediaProfileReader