tree 716669410b52fd7dc61aa72926b729c891876c1d
parent 3effe3dfc1efd6b8a42b949a8a11d6229ac38bd3
parent 2f1276dd22ac651956e313d65fbb5afac795ac48
author James Dong <jdong@google.com> 1278539780 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1278539780 -0700

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