summaryrefslogtreecommitdiff
path: root/libs/rs/rsProgramRaster.cpp
diff options
context:
space:
mode:
author James Dong <jdong@google.com> 2010-07-07 14:58:26 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-07-07 14:58:26 -0700
commit7b3f3048725dcb217599590fcb55a5b26b93dc4e (patch)
tree890146207799734d80f1b48ae2ef4473b6c9dbb1 /libs/rs/rsProgramRaster.cpp
parentdcf872dcfa6439514c886f8b9bf997beeeb3be85 (diff)
parent58c35573cc677b736efefa267eba8727d4411999 (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
Diffstat (limited to 'libs/rs/rsProgramRaster.cpp')
0 files changed, 0 insertions, 0 deletions