summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-12 22:38:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-12 22:38:47 +0000
commit6a846dd51885df861f4e1e30fcca86b9dd2f4092 (patch)
tree4b9f98fe510268b64bc82cc473bd0ece91da0d30 /opengl/tests/gl_basic/gl_basic.cpp
parent0e3234b7f11048d8291d5427cc0acfb77ba6b843 (diff)
parent5f5a0e0ffd89c98742ddedaf01fa13220a542272 (diff)
am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."
* commit '5f5a0e0ffd89c98742ddedaf01fa13220a542272': Lose HAVE_ANDROID_OS from frameworks/native.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions