summaryrefslogtreecommitdiff
path: root/opengl/libagl/TextureObjectManager.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-02-27 13:09:40 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-02-27 13:09:40 -0800
commitf5231683b100b8af8e7e9cae3ebd3a39459b339d (patch)
tree0ecbd0769f339854cca023a8cf56e75f0ba5aa63 /opengl/libagl/TextureObjectManager.cpp
parentd5a1b941435292322eb8f13705ba2a4db73cf19f (diff)
parentf2b5df8a526c184c492275ec8153a5519e1953bd (diff)
am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d': 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