diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 20:16:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 20:16:02 +0000 |
| commit | b6bec1d215ffa947db84981fa9ce6627a6c54ee7 (patch) | |
| tree | 891ef4ebfcd5b929c79de95eb3629f3f16d458db /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 076aaa5e81da1252e9da0f1a2b8a7ff925437c4b (diff) | |
| parent | 275a183312b7d3f449594010ab20541c2e99a895 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: cef1a1294a -s ours am: ad9f77387a -s ours am: 1bb4d35d5d -s ours am: 7eacf92c1d -s ours am: 275a183312 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420149
Change-Id: Ib06154463e72caa00736a019f1edd9f22a3f3a0b
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions