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
This commit is contained in:
commit
6481c7fd2b