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-10 21:10:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 21:10:47 +0000
commit67bf8881b8d8ee21bbb47f51062747fad61d7214 (patch)
tree5d243054d6f77d8b6d67c86a587b48c43c8af8e5 /opengl/tests/gl_basic/gl_basic.cpp
parent0b8d8ab22b28bb68caf670237e4f9fe3ed317266 (diff)
parent9997b07e77e4890135d27bf181de58455d64892e (diff)
Merge "Merge "Track sent conversations better" into rvc-dev am: e59c7e4618 am: ea4427b6ea am: 4a94462d7f" into rvc-qpr-dev-plus-aosp am: 9997b07e77
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821055 Change-Id: If19d8bf222c9784e40198f3bad5e297c8ed5c1e3
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions