summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Tom Taylor <tomtaylor@google.com> 2010-07-21 10:49:48 -0700
committer Tom Taylor <tomtaylor@google.com> 2010-07-21 10:49:48 -0700
commitdbac180d8342a7db2bb9994f937869eecb6b50ff (patch)
tree76d31c2ef9d9adcae2af8244ac378efbefc7e46a /opengl/libagl/TextureObjectManager.cpp
parent2f0dc6d9f50ceece294e9db393583e655d3bf781 (diff)
Fix a merge problem with html mms
Html mms message support was added back in Jan '10. At that time, we had moved the mms code out of the framework into the mms app. We decided to back out that change and leave the mms code in its original place. As a result, the changes to support html messages were lost. This handmerged CL restores those changes. I'll cherry-pick this into master as well. Bug 2858888 Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions