summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDima Zavin <dima@android.com>2013-11-23 12:36:54 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-23 12:36:54 -0800
commitf4325ceea48103490aacbf335280e94ea24cdd8f (patch)
tree51a5aed45a2189447ca8b0f19cef1993beea0d8e /opengl/tests/gl_basic/gl_basic.cpp
parent24bff56ff591607d6515a286bb7908882dcb3bc1 (diff)
parent63b62e8cd48176abbfddb6bd67c138ae447f6ac7 (diff)
am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"
* commit '63b62e8cd48176abbfddb6bd67c138ae447f6ac7': Remove incompatible ashmem.h
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions