diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-03-07 20:58:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-07 20:58:38 +0000 |
| commit | 5ec6a340f00819091b398be919c87a8ce889810b (patch) | |
| tree | 2c008318353a6457d0ea3fa799c442da4bd38122 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 139a93c3da60040646e5d85ac1cde45e1b4d6128 (diff) | |
| parent | 42bda3d02073a2fda38261c389aacbb178d38d1d (diff) | |
Merge "[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"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions