diff options
| author | Steven Thomas <steventhomas@google.com> | 2017-09-30 02:38:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-30 02:38:17 +0000 |
| commit | 87d42635af7427ffdae2dcab0d6e827fbb677463 (patch) | |
| tree | cad8b88c96a670b1f983bcdc003d702b41c6bb10 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3819afa4849370689f5de398e51e46bdc262c787 (diff) | |
| parent | c026c52ee67c7019a8018e2a5ec05d32b208ed94 (diff) | |
Merge "Fix deadlock when transitioning to vr flinger" into oc-mr1-dev
am: c026c52ee6
Change-Id: I1703d835bba529afdc4c7b9d6b8a3c195b1686df
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions