diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 20:16:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 20:16:53 +0000 |
| commit | 7d57608cabfd10da802e5798d6d34d8ec347b4d8 (patch) | |
| tree | 891ef4ebfcd5b929c79de95eb3629f3f16d458db /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7dfa6224d106ba3fb45a7a7cbb4824871ca89d23 (diff) | |
| parent | a1190a26a58393e3a3fc7abc2e3609cdf2da20f6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a707ff54b5 -s ours am: 29af1eadd2 -s ours am: cac9ebbec3 -s ours am: 9a09b64778 -s ours am: a1190a26a5 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419937
Change-Id: Ib047bb3a9b5bfa228cb473b9a7a6fdffa3b35337
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions