diff options
| author | Xin Li <delphij@google.com> | 2019-09-11 16:28:11 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-11 16:28:11 -0700 |
| commit | 37a2cefd5d7d316dc6d5d7f6d9cf3c4f022d7186 (patch) | |
| tree | 6cf78b9913c0144f32c5ee6d97864bec7eeb2d00 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e214905ad05caf49ccf5fafd1291cd92dd792242 (diff) | |
| parent | 97a5254ecc32ea89e56b2203c34b4231862dd599 (diff) | |
Merge "[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d57e959e71 -s ours am: 9b2f502e0a -s ours
am: 97a5254ecc -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2dc is in history
Change-Id: I118ff30ef1a88f27bf803276f1cba245bc6ccbc6
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions