diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-07 17:52:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-07 17:52:39 +0000 |
| commit | 2e5903f9c3bf3a347dc9469e634c225ea51085d8 (patch) | |
| tree | 72084f48b62a7c54b2871da527924952da28f091 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 61087b13b34d6759fe24d1af5a1ef82eb75f3857 (diff) | |
| parent | c4b7e5825ad2c6aae1512d4744c47fb054a495c1 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c4b7e5825a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15222612
Change-Id: I42690285404dcacc309aebb7c2dc40decddb72aa
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions
