diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-15 22:05:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-15 22:05:16 +0000 |
| commit | f6bd4784080234e9fb2f1a0e3f0f866ac3967970 (patch) | |
| tree | 1e083412102f6cc9ee905687ea1e736323692061 /opengl/java/android/opengl/Material.java | |
| parent | 80793d913140fd8e3157e31a08216d9602132390 (diff) | |
| parent | b3ebc605555ad76bad110cdcafa3456349d51c0c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 4bc07509f3 -s ours am: 2afd281ad3 -s ours am: b3ebc60555 -s ours
am skip reason: subject contains skip directive
Change-Id: I45d928a6f9d1e63ada8d48095b800567c3f3fe27
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions