summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-13 03:30:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-13 03:30:31 +0000
commitd967a9fcfcc51f0e7bf83217353176a0ed415a30 (patch)
tree8cd4365b8a14dee322b3d272600f3f83d2bf9a4f /opengl/tests/gl_basic/gl_basic.cpp
parent13d6f8e404009c404491d373f340aacc9a51ec9d (diff)
parentc94d39c216a48c2bd415c49f64d2d532bd35fd1c (diff)
Merge "Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe093 am: 60d328b77a" into rvc-d1-dev-plus-aosp am: 697cb8451f am: c94d39c216
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11856230 Change-Id: I8e01a9c78c4abf6e9313959efe009265933d11e1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions