tree 39ab3a58ded5aab006927b9926834a81ec40342b
parent c737a0c92910e5925965efc00d73aca568a5e119
parent 06c6175475d5560b91fb46b926cd0f879cefe037
author James Dong <jdong@google.com> 1278540022 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1278540022 -0700

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