diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 20:17:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 20:17:07 +0000 |
| commit | 6a7cdf3f9f4866464ab05d5ad3f3b2be47d36961 (patch) | |
| tree | 891ef4ebfcd5b929c79de95eb3629f3f16d458db /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7d57608cabfd10da802e5798d6d34d8ec347b4d8 (diff) | |
| parent | 9efb7d672d23b5b87d5d68b96e68372f9cb07ea5 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c99182a22 -s ours am: 087b60fcb3 -s ours am: 74cf3b1d1a -s ours am: 74be5a4016 -s ours am: 9efb7d672d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419941
Change-Id: Id73f94f822ae04ed9cc827aa76d0a73f38fb7fd1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions