summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDeckard Autoverifier <deckard@android.com>2011-07-18 15:46:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-18 15:46:18 -0700
commit0ccd5a4b14ea9a0ab9e360b8f996aedcf8bacb50 (patch)
treefa13c7779a720a6f160738e00be4f9c8a51c7b79 /opengl/tests/gl_basic/gl_basic.cpp
parenta7f805c61239f042918f0ad328de197dbca90a01 (diff)
parent6ec08140b26bace3c679ef0c5c9b9e5b3d9d5164 (diff)
am d4dee1a5: am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"
* commit 'd4dee1a57fdcd1bd1e7c621163e89039cf88d9f9': stagefright aacenc: 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