summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-25 08:57:36 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-25 08:57:36 -0800
commitcbafdc6c159ab9c77e6037f9d8924641a5177848 (patch)
tree1e8929040b814a6648119145260d7c8edfadde1f /opengl/tests/gl_basic/gl_basic.cpp
parentdf80c5b1803dcc3011847eaf66af456d34f430ab (diff)
parent9364b5c01efcf4e70766101f947b9642d53cdf11 (diff)
am e2594b85: am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit 'e2594b85093441e03150c7cfc540abc626884eaf': stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions