summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-07-18 16:55:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-18 16:55:33 -0700
commit83937f38f0ea0d22b3a8ac61960fe87eb419f6c9 (patch)
tree62a3555429c3caf6d6220df764adf91a9ee9b991 /opengl/tests/gl_basic/gl_basic.cpp
parentc2c84e91b2e6cf354c1154b227ff5679b35c7401 (diff)
parent60f8195edcf75969041bcbebdf5ed54ea76f9ec2 (diff)
am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362': stagefright aacenc: Mark codeWord as UWord16
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions