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