diff options
| author | Jack Yu <jackyu@google.com> | 2018-02-02 07:16:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-02 07:16:19 +0000 |
| commit | 9b422d88112597d756e594c72f4ce17a2a7e45f0 (patch) | |
| tree | 3fd674f8956e15e6898dffa46baa8748ac6bc167 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6346df1d00cac37e427e12bed5207bb1a720791b (diff) | |
| parent | 4fcd48db4bf03050381cfc79bc999200cb6b6df7 (diff) | |
Merge "Added support for the new 1.2 data setup/deactivate API" am: a02d09a449 am: 8208b2ef2e
am: 4fcd48db4b -s ours
Change-Id: If6c0ff777cd49e083c218755831854945fabf098
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions