diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-03-22 02:13:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-22 02:13:07 +0000 |
| commit | 632f375ab1e8911c5d20a24c54e4c8db3831963d (patch) | |
| tree | f9e930ee9741bb2c0808c8dfb4ec0018a931953d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | eb60761910be2753496a7e017d007781a52850bd (diff) | |
| parent | c3adbc2bfef8b0f753e959303df9ad65cb64bd45 (diff) | |
Merge "resolve merge conflicts of 7e0769b219257a5053ad79160574892c5aca9ca2 to rvc-dev" into rvc-dev am: e0ee0e4d4b am: 2c368db871 am: 028995a590 am: c3adbc2bfe
Change-Id: Ia8c840f054695c63aed2e6ac3566db298327017f
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions