summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2019-07-27 22:15:23 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-27 22:15:23 -0700
commit5e88df7c868749f09f96672e590a1401dfe6867c (patch)
tree785e0d4b08fe0a94d81865a18cf6587fd7feaea5 /opengl/tests/gl_basic/gl_basic.cpp
parent7101bbbb6ddca8edce67535adb20a37870c3f893 (diff)
parent6c9389f1a7ec95fdc0a0cf607e871e88490320bf (diff)
[automerger skipped] Merge "[DO NOT MERGE] Don't drop restricted permissions on upgrade am: 0b41c8940a am: 29adaea681 am: 6145571f9e" into qt-qpr1-dev-plus-aosp
am: 6c9389f1a7 -s ours am skip reason: subject contains skip directive Change-Id: Icf6f2553b090e9790679abf7e142f4d59982bd36
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions