summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2011-11-09 16:59:48 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2011-11-09 16:59:48 +0000
commit72aa4697fa802aa0bbc653881094ccb42f836ec9 (patch)
tree8d4bb5c0feb92d67aaec43e9e24604dae2400c0c /opengl/libagl/TextureObjectManager.cpp
parent0455970132783beeac216ba374b2cf01f5d5c47a (diff)
parentbd33207d6807bde5204c552459e8bc5b61bed4f4 (diff)
am 20cf0916: Merge "Bug 5585323 New system permission for media decode" into ics-mr1
* commit '20cf0916cc6a4920b1d882a9478615a15fe6b3b0': Bug 5585323 New system permission for media decode
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions