summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorFelipe Leme <felipeal@google.com>2017-08-16 16:38:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-16 16:38:18 +0000
commit749be6617808399cb96d79a298367ae40dac2975 (patch)
tree2a4c63e73cc8b548573fccb63a590601f490a4d9 /opengl/tests/gl_basic/gl_basic.cpp
parent6fc20cbffb9c9cdcbfdf013c9c4f52bff2037609 (diff)
parent486ecbe517f0d14de7c2226483feb06a95244be4 (diff)
Merge "Calls CancellationSignal when onFillRequest() times out." into oc-mr1-dev am: 6ba128762f
am: 486ecbe517 Change-Id: I31e4df984dee929ee7efef64aaa957a80be9d1a5
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions