diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-16 08:37:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 08:37:39 +0000 |
| commit | 35539d7b064f8e0f7517a816d1851d0c70de55f4 (patch) | |
| tree | 967c17b3e82533006826f05c48d29e96ed6eb5d1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 31850f0cd7518e3aef4b8357009b6235e65e8268 (diff) | |
| parent | 1aa6174965602d2f13749316cb05715aa00b8d1a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 9a55c179fb -s ours am: d74a33680c -s ours am: 1aa6174965 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12165581
Change-Id: Ibb2a1ea1299e1699665862bc97ffb9a8cd4f0abe
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions