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-05-29 23:28:56 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-29 23:28:56 +0000
commit9a0e76589eb965f67669cae6c18268b82ce2b417 (patch)
treec1c1537d445c974f26e5c383f4f829b315880f82 /opengl/tests/gl_basic/gl_basic.cpp
parentfb9aff253f2019e4101ec20aea704565028cef72 (diff)
parentaf013f6f5a1662424fa416a6f2407adcce729de5 (diff)
Merge "Merge "[am] resolve service again when resetting userId in retrieveServiceLocked()" into rvc-dev am: 1aced77c2e am: fc25cbb078 am: 90f70aaffb" into rvc-qpr-dev-plus-aosp am: af013f6f5a
Change-Id: Ic06ca0ad9c8aa74c8dfcd704a43800c7047cf867
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions