diff options
| author | Peng Xu <pengxu@google.com> | 2017-09-23 01:34:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-23 01:34:11 +0000 |
| commit | f4054466c4635d80e9ff3d21a7e7c19d8c9f4c71 (patch) | |
| tree | 668e8035d4423a4841b1e4aeb34e487a5a2a2838 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b7d03db7b4fb60eeab0035add4789e5f94551625 (diff) | |
| parent | ab1f0724b0f8291547713985bd63dc83c6bb7881 (diff) | |
resolve merge conflicts of 4f33ab9ef to stage-aosp-master am: 3cd9b00a9a
am: ab1f0724b0 -s ours
Change-Id: I74c3443b8db44fd6593caaf5fe96b94a8dc5adfc
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions