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:12:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-10 21:12:53 +0000
commit1f4d472149f54cdc903c9d010a6e212b706396fa (patch)
treeb7bfe1cd9a9c5c8ef86ad8defeb85eecc0a41fc0 /opengl/tests/gl_basic/gl_basic.cpp
parent8a757fc5fbe574b3cb7275ec8a850cdcb406fbe0 (diff)
parentecfd72b92c37fc94a2666e5aa23140e03d544a79 (diff)
Merge "Merge "Merge "Track sent conversations better" into rvc-dev am: e59c7e4618 am: ea4427b6ea" into rvc-d1-dev-plus-aosp am: fefd37a9a2" into rvc-qpr-dev-plus-aosp am: ecfd72b92c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11821055 Change-Id: I9ef407bbfd6e623c2dfa8f740e88fdac7e3698be
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions