summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-02-27 13:07:12 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-27 13:07:12 -0800
commitf2b5df8a526c184c492275ec8153a5519e1953bd (patch)
tree0ecbd0769f339854cca023a8cf56e75f0ba5aa63 /opengl/libagl/TextureObjectManager.cpp
parentbb4bcfc028b489b8e10ce448e7e0df5b8f3ecdeb (diff)
parent98fc51d885a3e28ce6fbd059b55eb4b08317b538 (diff)
am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '5aff259c61e54e441ed04bf77e3cc69a0374432d': stagefright aacenc: Don't address a Word32 with a Word16 pointer
Diffstat (limited to 'opengl/libagl/TextureObjectManager.cpp')
0 files changed, 0 insertions, 0 deletions