diff options
| author | Alex Cheung <alexcheung@google.com> | 2015-12-23 14:49:50 -0800 |
|---|---|---|
| committer | Alex Cheung <alexcheung@google.com> | 2015-12-23 14:49:50 -0800 |
| commit | 6fc536c92835047045bab298ded8beff2ca88dae (patch) | |
| tree | bf04c6d33713fa40cd1d173649574fc5c506b837 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6a8681a4e67f9d4f4ef4984f378167768a62ea12 (diff) | |
| parent | 268ffedec12faef2b1e91e69709d6caa2b258ea3 (diff) | |
Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions