diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 07:49:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 07:49:21 +0000 |
| commit | 6394530395dd53a1f0a27b674cf0c1048f8c21e1 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 55d8664aa0bc9cdc0e742967f24825f8f3b5cd30 (diff) | |
| parent | 8feb6c9e2af673bdfe6e9d5b7d58763d950a4679 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5443e7b99d -s ours am: b55d292da6 -s ours am: 028ad0a064 -s ours am: 6987945270 -s ours am: 8feb6c9e2a -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420006
Change-Id: Iddbed9a064561d92602e3b417f9121a797b27754
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions