diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 20:16:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 20:16:39 +0000 |
| commit | 7dfa6224d106ba3fb45a7a7cbb4824871ca89d23 (patch) | |
| tree | 891ef4ebfcd5b929c79de95eb3629f3f16d458db /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b6bec1d215ffa947db84981fa9ce6627a6c54ee7 (diff) | |
| parent | 542de1abfb5ad138aaa42b17d2fdfc37bbc98564 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1a32ff0e6e -s ours am: 0b757ad8cc -s ours am: 3f0ba7f95d -s ours am: d6537cb99d -s ours am: 542de1abfb -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419938
Change-Id: I9927ce09c3f22ff051caa480d99ee5c2a830c9a7
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions