diff options
| author | Andrei-Valentin Onea <andreionea@google.com> | 2019-03-07 12:56:57 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-07 12:56:57 -0800 |
| commit | 42bda3d02073a2fda38261c389aacbb178d38d1d (patch) | |
| tree | 18d22f94a2e273bc588d1e119053ab17fac9afe7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 279e84697d3912985819c926a7b6da9b79974067 (diff) | |
| parent | 369804d4e474f89ae5f4a93c16db2505bbe06d6e (diff) | |
[automerger skipped] Merge "Merge "Add @UnsupportedAppUsage annotations" am: 315404a9a5" into stage-aosp-master am: 75b9b48cec
am: 369804d4e4 -s ours
am skip reason: change_id I65c961e3f59b9868156b3ee6a3b1cab81b0e9d25 with SHA1 4b2116ca79 is in history
Change-Id: I0f58f08e1ae3e5850bd9e7ff8a128867a3d4670f
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions