diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-10 23:09:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2019-12-10 23:09:09 +0000 |
| commit | f0a04182d9b36ca8b292d10d57b9580568224fed (patch) | |
| tree | 1d837caed1ee20724b9e1062e4b35e2653e19af8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b60720ff9e9f42c70796b44a35855568e4440700 (diff) | |
| parent | 695aca210a3ee7195094aebe6b7f7c03a877045b (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" into qt-qpr1-dev am: f345ab53bc am: 695aca210a -s ours
am skip reason: subject contains skip directive
Change-Id: Id880bc2816378d5b06d10b75e95fb3c14262f8f9
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions