summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-12 23:21:58 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-12 23:21:58 +0000
commitc6ada3b169827f581cd61749c6056c4209ebb650 (patch)
tree508acc37b5d241c99acdf9c30e8b98937018ae28 /opengl/tests/gl_basic/gl_basic.cpp
parent18343a2fd11583b884d1566a232a75b004fb3813 (diff)
parent6a846dd51885df861f4e1e30fcca86b9dd2f4092 (diff)
am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."
* commit '6a846dd51885df861f4e1e30fcca86b9dd2f4092': Lose HAVE_ANDROID_OS from frameworks/native.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions