diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-13 03:22:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-13 03:22:27 +0000 |
| commit | cfa17a60ef1c28d01bb65e7c783b2291f01d61f4 (patch) | |
| tree | a62250e1dbcc604ad4dc9f1a2e512756e1bb365b /opengl/java/android/opengl/Material.java | |
| parent | 0df43165b6955c56ca59f29616d1dfcf055ad8c0 (diff) | |
| parent | 8992e8885406b89bdfb0412b1a6d95c607924b28 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 480b1d9857 -s ours am: 8992e88854 -s ours
am skip reason: subject contains skip directive
Change-Id: If30af21209f957e683dee768f6fc907bb35f8440
Diffstat (limited to 'opengl/java/android/opengl/Material.java')
0 files changed, 0 insertions, 0 deletions