commit | 06c6175475d5560b91fb46b926cd0f879cefe037 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Wed Jul 07 14:58:26 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 07 14:58:26 2010 -0700 |
tree | c3155828f6d2aaf434542df235aa342648b40a7d | |
parent | 2801326cd3ff307e72d7b19d52743d9eea345280 [diff] | |
parent | 64b99bd495d68177f72bcd6a6853d0915da2714d [diff] |
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 '58c35573cc677b736efefa267eba8727d4411999' into gingerbread-plus-aosp * commit '58c35573cc677b736efefa267eba8727d4411999': Fix some bugs in the MediaProfileReader