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